Changeset 121 for smplayer/vendor/current/src/mplayerprocess.cpp

Timestamp:

Mar 15, 2012, 5:14:10 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer 0.7.1: vendor update

File:

• smplayer/vendor/current/src/mplayerprocess.cpp (modified) (4 diffs)

smplayer/vendor/current/src/mplayerprocess.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -28 +28 @@
 
 using namespace Global;
+
+#define TOO_CHAPTERS_WORKAROUND
 
 MplayerProcess::MplayerProcess(QObject * parent) : MyProcess(parent) 
@@ -473 +475 @@
                 }
 
-                if ( (mplayer_svn == -1) && (line.startsWith("MPlayer ")) ) {
+                if ( (mplayer_svn == -1) && ((line.startsWith("MPlayer ")) || (line.startsWith("MPlayer2 "))) ) {
                         mplayer_svn = MplayerVersion::mplayerVersion(line);
                         qDebug("MplayerProcess::parseLine: MPlayer SVN: %d", mplayer_svn);
@@ -845 +847 @@
                         if (tag == "ID_CHAPTERS") {
                                 md.chapters = value.toInt();
+                                #ifdef TOO_CHAPTERS_WORKAROUND
+                                if (md.chapters > 1000) {
+                                        qDebug("MplayerProcess::parseLine: warning too many chapters: %d", md.chapters);
+                                        qDebug("                           chapters will be ignored"); 
+                                        md.chapters = 0;
+                                }
+                                #endif
                         }
                         else