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

Timestamp:

May 15, 2014, 7:53:54 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.7

File:

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

smplayer/vendor/current/src/mplayerprocess.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -77 +77 @@
 
         dvd_current_title = -1;
+        br_current_title = -1;
 
         MyProcess::start();
@@ -159 +160 @@
 #endif
 static QRegExp rx_video("^ID_VID_(\\d+)_(LANG|NAME)=(.*)");
-static QRegExp rx_title("^ID_DVD_TITLE_(\\d+)_(LENGTH|CHAPTERS|ANGLES)=(.*)");
+static QRegExp rx_title("^ID_(DVD|BLURAY)_TITLE_(\\d+)_(LENGTH|CHAPTERS|ANGLES)=(.*)");
 static QRegExp rx_chapters("^ID_CHAPTER_(\\d+)_(START|END|NAME)=(.+)");
 static QRegExp rx_winresolution("^VO: \\[(.*)\\] (\\d+)x(\\d+) => (\\d+)x(\\d+)");
@@ -179 +180 @@
 static QRegExp rx_fontcache("^\\[ass\\] Updating font cache|^\\[ass\\] Init");
 static QRegExp rx_scanning_font("Scanning file");
+static QRegExp rx_forbidden("Server returned 403: Forbidden");
 #if DVDNAV_SUPPORT
 static QRegExp rx_dvdnav_switch_title("^DVDNAV, switched to title: (\\d+)");
@@ -369 +371 @@
                 // No video
                 if (rx_novideo.indexIn(line) > -1) {
-                        md.novideo = TRUE;
+                        md.novideo = true;
                         emit receivedNoVideo();
                         //emit mplayerFullyLoaded();
@@ -621 +623 @@
                 else
 
-                // DVD titles
+                // DVD/Bluray titles
                 if (rx_title.indexIn(line) > -1) {
-                        int ID = rx_title.cap(1).toInt();
-                        QString t = rx_title.cap(2);
+                        int ID = rx_title.cap(2).toInt();
+                        QString t = rx_title.cap(3);
 
                         if (t=="LENGTH") {
-                                double length = rx_title.cap(3).toDouble();
+                                double length = rx_title.cap(4).toDouble();
                                 qDebug("MplayerProcess::parseLine: Title: ID: %d, Length: '%f'", ID, length);
                                 md.titles.addDuration(ID, length);
@@ -633 +635 @@
                         else
                         if (t=="CHAPTERS") {
-                                int chapters = rx_title.cap(3).toInt();
+                                int chapters = rx_title.cap(4).toInt();
                                 qDebug("MplayerProcess::parseLine: Title: ID: %d, Chapters: '%d'", ID, chapters);
                                 md.titles.addChapters(ID, chapters);
@@ -639 +641 @@
                         else
                         if (t=="ANGLES") {
-                                int angles = rx_title.cap(3).toInt();
+                                int angles = rx_title.cap(4).toInt();
                                 qDebug("MplayerProcess::parseLine: Title: ID: %d, Angles: '%d'", ID, angles);
                                 md.titles.addAngles(ID, angles);
@@ -770 +772 @@
                 if (rx_scanning_font.indexIn(line) > -1) {
                         emit receivedScanningFont(line);
+                }
+                else
+
+                if (rx_forbidden.indexIn(line) > -1) {
+                        qDebug("MplayerProcess::parseLine: 403 forbidden");
+                        emit receivedForbiddenText();
                 }
                 else
@@ -807 +815 @@
                                 md.duration = value.toDouble();
                                 qDebug("MplayerProcess::parseLine: md.duration set to %f", md.duration);
+                                // Use the bluray title length if duration is 0
+                                if (md.duration == 0 && br_current_title != -1) {
+                                        int i = md.titles.find(br_current_title);
+                                        if (i != -1) {
+                                                double duration = md.titles.itemAt(i).duration();
+                                                qDebug("MplayerProcess::parseLine: using the br title length: %f", duration);
+                                                md.duration = duration;
+                                        }
+                                }
                         }
                         else
@@ -887 +904 @@
                                 dvd_current_title = value.toInt();
                         }
+                        else
+                        if (tag == "ID_BLURAY_CURRENT_TITLE") {
+                                br_current_title = value.toInt();
+                        }
+
                 }
         }