EDL (and ComSkip) integration - Printable Version

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 = ""; // DD

   m_synccomp = 0.0f;

 }

 void CMPlayer::Options::SetFPS(float fFPS)

@@ -279,6 +280,12 @@



   m_iAutoSync = iAutoSync;

 }

 

+// DD

+void CMPlayer::Options::SetEdl(const string& strEdl)

+{

+  m_strEdl = strEdl;

+}

+

 void CMPlayer::Options::GetOptions(int& argc, char* argv[])

 {

   CStdString strTmp;

@@ -332,6 +339,13 @@



     }

   }

 

+    // DD

+  if (m_strEdl.length() > 0)

+  {

+      m_vecOptions.push_back("-edl=" + m_strEdl );

+      CLog::Log(LOGINFO, "Found EDL file, adding -edl=%s", m_strEdl.c_str());

+  }

+

   //MOVED TO mplayer.conf

   //Enable mplayer's internal highly accurate sleeping.

   //m_vecOptions.push_back("-softsleep");

@@ -858,6 +872,17 @@



     m_iPTS = 0;

     m_bPaused = false;

 

+    // DD Check for EDL file

+    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();

Index: MPlayer.h



===================================================================



--- MPlayer.h    (revision 9840)



+++ MPlayer.h    (working copy)



@@ -61,6 +61,9 @@



 

     void SetAutoSync(int iAutoSync);

 

+    // DD

+    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 +97,7 @@



     string m_demuxer;

     bool m_bDisableAO;

     string m_subcp;

+    string m_strEdl;

     string m_strChannelMapping;

     string m_strDvdDevice;

     string m_strFlipBiDiCharset;