Observations:
- The 'mute' function doesn't seem to work
- The 'skip' function works fine. You can still use the forward/back functions to see the skipped parts.
Here is the patch, hopefully using the correct format this time:
Code:
Index: mplayer.cpp
===================================================================
--- mplayer.cpp (revision 9840)
+++ mplayer.cpp (working copy)
@@ -122,6 +122,7 @@
m_bLimitedHWAC3 = false;
m_bDeinterlace = false;
m_subcp = "";
+ m_strEdl = "";
m_synccomp = 0.0f;
}
void CMPlayer::Options::SetFPS(float fFPS)
@@ -279,6 +280,11 @@
m_iAutoSync = iAutoSync;
}
+void CMPlayer::Options::SetEdl(const string& strEdl)
+{
+ m_strEdl = strEdl;
+}
+
void CMPlayer::Options::GetOptions(int& argc, char* argv[])
{
CStdString strTmp;
@@ -332,6 +338,12 @@
}
}
+ if (m_strEdl.length() > 0)
+ {
+ m_vecOptions.push_back("-edl");
+ m_vecOptions.push_back( m_strEdl.c_str());
+ }
+
//MOVED TO mplayer.conf
//Enable mplayer's internal highly accurate sleeping.
//m_vecOptions.push_back("-softsleep");
@@ -858,6 +870,16 @@
m_iPTS = 0;
m_bPaused = false;
+ CStdString strEdlFileName;
+ if (!bFileOnInternet && bIsVideo && !bIsDVD )
+ {
+ CUtil::ReplaceExtension(strFile, ".edl", strEdlFileName);
+ if ( CFile::Exists(strEdlFileName) )
+ {
+ options.SetEdl(strEdlFileName);
+ }
+ }
+
// first init mplayer. This is needed 2 find out all information
// like audio channels, fps etc
load();
@@ -2051,4 +2073,4 @@
m_evProcessDone.WaitMSec(1000);
m_evProcessDone.WaitMSec(1000);
}
-}
\ No newline at end of file
+}
Index: MPlayer.h
===================================================================
--- MPlayer.h (revision 9840)
+++ MPlayer.h (working copy)
@@ -61,6 +61,8 @@
void SetAutoSync(int iAutoSync);
+ void SetEdl(const string& strEdl);
+
void SetAudioOutput(const string& output) { m_videooutput = output; }
void SetVideoOutput(const string& output) { m_audiooutput = output; }
void SetAudioCodec(const string& codec) { m_videocodec = codec; }
@@ -94,6 +96,7 @@
string m_demuxer;
bool m_bDisableAO;
string m_subcp;
+ string m_strEdl;
string m_strChannelMapping;
string m_strDvdDevice;
string m_strFlipBiDiCharset;
![[Image: screenshot001ys9.th.jpg]](http://img504.imageshack.us/img504/4736/screenshot001ys9.th.jpg)
![[Image: badge.gif]](http://www.ohloh.net/projects/9132/badge.gif)
Search
Help