Changeset 130 for smplayer/vendor/current/src/core.cpp

Timestamp:

Apr 30, 2012, 7:09:25 PM (14 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer vendor: 0.8.0

File:

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

smplayer/vendor/current/src/core.cpp

@@ -784 +784 @@
 
 #ifdef YOUTUBE_SUPPORT
-        if (name.contains("youtube.com/watch", Qt::CaseInsensitive)) {
+        if (name.contains("youtube.com/watch", Qt::CaseInsensitive) || 
+        name.contains("youtu.be/", Qt::CaseInsensitive) ||
+        name.contains("y2u.be/", Qt::CaseInsensitive) )
+        {
                 qDebug("Core::openStream: youtube url detected");
                 if (name.startsWith("www.youtube.com")) name = "http://" + name;
                 if (name.startsWith("youtube.com")) name = "http://www." + name;
+
+
                 yt->setPreferredQuality( (RetrieveYoutubeUrl::Quality) pref->yt_quality );
                 yt->fetchPage(name);
@@ -3453 +3458 @@
         qDebug("Core::changeChapter: ID: %d", ID);
 
-        if (ID != mset.current_chapter_id) {
-                //if (QFileInfo(mdat.filename).extension().lower()=="mkv") {
-                if (mdat.type != TYPE_DVD) {
+        if (mdat.type != TYPE_DVD) {
+                /*
+                if (mdat.chapters.find(ID) > -1) {
+                        double start = mdat.chapters.item(ID).start();
+                        qDebug("Core::changeChapter: start: %f", start);
+                        goToSec(start);
+                        mset.current_chapter_id = ID;
+                } else {
+                */
+                        tellmp("seek_chapter " + QString::number(ID) +" 1");
+                        mset.current_chapter_id = ID;
+                        //updateWidgets();
+                /*
+                }
+                */
+        } else {
+#if SMART_DVD_CHAPTERS
+                if (pref->cache_for_dvds == 0) {
+#else
+                if (pref->fast_chapter_change) {
+#endif
                         tellmp("seek_chapter " + QString::number(ID) +" 1");
                         mset.current_chapter_id = ID;
                         updateWidgets();
                 } else {
-#if SMART_DVD_CHAPTERS
-                        if (pref->cache_for_dvds == 0) {
-#else
-                        if (pref->fast_chapter_change) {
-#endif
-                                tellmp("seek_chapter " + QString::number(ID) +" 1");
-                                mset.current_chapter_id = ID;
-                                updateWidgets();
-                        } else {
-                                stopMplayer();
-                                mset.current_chapter_id = ID;
-                                //goToPos(0);
-                                mset.current_sec = 0;
-                                restartPlay();
-                        }
+                        stopMplayer();
+                        mset.current_chapter_id = ID;
+                        //goToPos(0);
+                        mset.current_sec = 0;
+                        restartPlay();
                 }
         }
@@ -3493 +3506 @@
         int first_chapter = firstChapter();
 
-        last_chapter = mdat.n_chapters + firstChapter() - 1;
-
-        int ID = mset.current_chapter_id - 1;
-        if (ID < first_chapter) {
-                ID = last_chapter;
-        }
+        int ID = mdat.chapters.itemBeforeTime(mset.current_sec).ID();
+
+        if (ID == -1) {
+                last_chapter = mdat.n_chapters + firstChapter() - 1;
+
+                ID = mset.current_chapter_id - 1;
+                if (ID < first_chapter) {
+                        ID = last_chapter;
+                }
+        }
+
         changeChapter(ID);
 }
@@ -3505 +3523 @@
         qDebug("Core::nextChapter");
 
-        int last_chapter = 0;
-        last_chapter = mdat.n_chapters + firstChapter() - 1;
-
-        int ID = mset.current_chapter_id + 1;
-        if (ID > last_chapter) {
-                ID = firstChapter();
-        }
+        int last_chapter = mdat.n_chapters + firstChapter() - 1;
+
+        int ID = mdat.chapters.itemAfterTime(mset.current_sec).ID();
+
+        if (ID == -1) {
+                ID = mset.current_chapter_id + 1;
+                if (ID > last_chapter) {
+                        ID = firstChapter();
+                }
+        }
+
         changeChapter(ID);
 }