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

Timestamp:

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

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.7

File:

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

smplayer/vendor/current/src/core.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <[email protected]>
+    Copyright (C) 2006-201 Ricardo Villalba <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
@@ -224 +224 @@
              this, SLOT(dvdTitleIsMovie()) );
 #endif
-        
+
+        connect( proc, SIGNAL(receivedForbiddenText()), this, SIGNAL(receivedForbidden()) );
+
         connect( this, SIGNAL(stateChanged(Core::State)), 
                  this, SLOT(watchState(Core::State)) );
@@ -245 +247 @@
 
 #if DVDNAV_SUPPORT
-        connect( mplayerwindow, SIGNAL(mouseMoved(QPoint)), 
+        connect( mplayerwindow
              this, SLOT(dvdnavUpdateMousePos(QPoint)) );
 #endif
@@ -258 +260 @@
         // Windows or OS2 screensaver
         win_screensaver = new WinScreenSaver();
-#endif
-#endif
-
-#if DISCNAME_TEST
-        DiscName::test();
+        connect( this, SIGNAL(aboutToStartPlaying()), this, SLOT(disableScreensaver()) );
+        connect( proc, SIGNAL(processExited()), this, SLOT(enableScreensaver()) );
+        connect( proc, SIGNAL(error(QProcess::ProcessError)), this, SLOT(enableScreensaver()) );
+#endif
 #endif
 
@@ -403 +404 @@
                 if (!prefix.isEmpty()) str = prefix + " " + str;
                 qDebug("Core::displayTextOnOSD: command: '%s'", str.toUtf8().constData());
-                proc->write(str.toAscii());
+                proc->write(str.to());
         }
 }
@@ -468 +469 @@
         }
         else
+
+
+
+
+
+
+
         if (file.toLower().startsWith("vcd:")) {
                 qDebug("Core::open: * identified as vcd");
@@ -540 +548 @@
 
 void Core::YTNoVideoUrl() {
-        emit showMessage( tr("Unable to locate the url of the video") );
-}
+        emit showMessage( tr("Unable to locate the URL of the video") );
+}
+#endif
+
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#ifdef SCREENSAVER_OFF
+void Core::enableScreensaver() {
+        qDebug("Core::enableScreensaver");
+        if (pref->turn_screensaver_off) {
+                win_screensaver->enable();
+        }
+}
+
+void Core::disableScreensaver() {
+        qDebug("Core::disableScreensaver");
+        if (pref->turn_screensaver_off) {
+                win_screensaver->disable();
+        }
+}
+#endif
 #endif
 
@@ -606 +632 @@
                         if ( (fi.exists()) && (fi.isDir()) ) {
                                 pref->dvd_directory = directory;
-                                pref->play_dvd_from_hd = TRUE;
+                                pref->play_dvd_from_hd = ;
                                 openDVD();
                         } else {
@@ -615 +641 @@
                 }
         } else {
-                pref->play_dvd_from_hd = FALSE;
+                pref->play_dvd_from_hd = ;
                 openDVD();
         }
@@ -756 +782 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void Core::openTV(QString channel_id) {
         qDebug("Core::openTV: '%s'", channel_id.toUtf8().constData());
@@ -814 +890 @@
 
 #ifdef YOUTUBE_SUPPORT
-        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;
-                if (name.startsWith("youtu.be")) name = "http://" + name;
-                if (name.startsWith("y2u.be")) name = "http://" + name;
+        // Check if the stream is a youtube url
+        QString yt_full_url = yt->fullUrl(name);
+        if (!yt_full_url.isEmpty()) {
+                qDebug("Core::openStream: youtube url detected: %s", yt_full_url.toLatin1().constData());
+                name = yt_full_url;
                 yt->setPreferredQuality( (RetrieveYoutubeUrl::Quality) pref->yt_quality );
                 qDebug("Core::openStream: user_agent: '%s'", pref->yt_user_agent.toUtf8().constData());
                 if (!pref->yt_user_agent.isEmpty()) yt->setUserAgent(pref->yt_user_agent);
                 #ifdef YT_USE_SCRIPT
-                YTSig::setScriptFile( Paths::configPath() + "/ytcode.script" );
+                YTSig::setScriptFile( Paths::configPath() + "/yt" );
                 #endif
                 yt->fetchPage(name);
@@ -1026 +1098 @@
         }
 
-        mdat.initialized = TRUE;
+        mdat.initialized = ;
 
         // MPlayer doesn't display the length in ID_LENGTH for audio CDs...
@@ -1132 +1204 @@
         changeAspectRatio(mset.aspect_ratio_id);
 
-        if (pref->global_volume) {
-                bool was_muted = pref->mute;
-                setVolume( pref->volume, true);
-                if (was_muted) mute(true);
+        if (pref->mplayer_additional_options.contains("-volume")) {
+                qDebug("Core::finishRestart: don't set volume since -volume is used");
         } else {
-                bool was_muted = mset.mute;
-                 setVolume( mset.volume, true );
-                if (was_muted) mute(true);
+                if (pref->global_volume) {
+                        bool was_muted = pref->mute;
+                        setVolume( pref->volume, true);
+                        if (was_muted) mute(true);
+                } else {
+                        bool was_muted = mset.mute;
+                         setVolume( mset.volume, true );
+                        if (was_muted) mute(true);
+                }
         }
 
@@ -1208 +1284 @@
 
 
-void Core::play()
-{
+void Core::play() {
         qDebug("Core::play");
-    
+
         if ((proc->isRunning()) && (state()==Paused)) {
                 tellmp("pause"); // Unpauses
-    } 
+        }
         else
         if ((proc->isRunning()) && (state()==Playing)) {
@@ -1229 +1304 @@
                         */
                         restartPlay();
-                }
-    }
+                } else {
+                        emit noFileToPlay();
+                }
+        }
 }
 
@@ -1302 +1379 @@
 {
     qDebug("Core::processFinished");
-
-#if  defined(Q_OS_WIN) || defined(Q_OS_OS2)
-#ifdef SCREENSAVER_OFF
-        // Restores the Windows or OS2 screensaver
-        if (pref->turn_screensaver_off) {
-                win_screensaver->enable();
-        }
-#endif
-#endif
-
         qDebug("Core::processFinished: we_are_restarting: %d", we_are_restarting);
 
@@ -1394 +1461 @@
         #endif
         yt->close();
-#endif
-
-#if  defined(Q_OS_WIN) || defined(Q_OS_OS2)
-#ifdef SCREENSAVER_OFF
-        // Disable the Windows or OS2 screensaver
-        if (pref->turn_screensaver_off) {
-                win_screensaver->disable();
-        }
-#endif
 #endif
 
@@ -1429 +1487 @@
                 qDebug("Core::startMplayer: url path: '%s'", url.path().toUtf8().constData());
 
-                QRegExp rx("\\.ram$|\\.asx$|\\.m3u$|\\.pls$", Qt::CaseInsensitive);
-                url_is_playlist = (rx.indexIn(url.path()) != -1);
+                if (url.scheme().toLower() != "ffmpeg") {
+                        QRegExp rx("\\.ram$|\\.asx$|\\.m3u$|\\.m3u8$|\\.pls$", Qt::CaseInsensitive);
+                        url_is_playlist = (rx.indexIn(url.path()) != -1);
+                }
         }
         qDebug("Core::startMplayer: url_is_playlist: %d", url_is_playlist);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
@@ -1736 +1816 @@
                 proc->addArgument( QString::number(mset.sub_scale_ass) );
 
+
+
+
+
                 if (!pref->force_ass_styles) {
                         // Load the styles.ass file
@@ -1759 +1843 @@
                 // Use the same font for OSD
 #if !defined(Q_OS_OS2)
-                if (!pref->ass_styles.fontname.isEmpty()) {
+                if ()) {
                         #ifdef USE_FONTCONFIG_OPTIONS
                         if (!pref->mplayer_is_mplayer2) { // -fontconfig removed from mplayer2
@@ -1861 +1945 @@
         }
 
-        if (mset.current_audio_id != MediaSettings::NoneSelected) {
-                // Workaround for MPlayer bug #1321 (http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1321)
-                if (mdat.audios.numItems() != 1) {
-                        proc->addArgument("-aid");
-                        proc->addArgument( QString::number( mset.current_audio_id ) );
+        if (mset.external_audio.isEmpty()) {
+                if (mset.current_audio_id != MediaSettings::NoneSelected) {
+                        // Workaround for MPlayer bug #1321 (http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1321)
+                        if (mdat.audios.numItems() != 1) {
+                                proc->addArgument("-aid");
+                                proc->addArgument( QString::number( mset.current_audio_id ) );
+                        }
                 }
         }
@@ -1968 +2054 @@
         bool use_volume_option = (MplayerVersion::isMplayerAtLeast(27872));
 
-        if (pref->global_volume) {
-                if (use_volume_option) {
-                        proc->addArgument("-volume");
-                        proc->addArgument( QString::number( pref->volume ) );
-                }
+        if (pref->mplayer_additional_options.contains("-volume")) {
+                qDebug("Core::startMplayer: don't set volume since -volume is used");
         } else {
-                if (use_volume_option) {
-                        proc->addArgument("-volume");
-                        // Note: mset.volume may not be right, it can be the volume of the previous video if
-                        // playing a new one, but I think it's better to use anyway the current volume on
-                        // startup than set it to 0 or something.
-                        // The right volume will be set later, when the video starts to play.
-                        proc->addArgument( QString::number( mset.volume ) );
+                if (pref->global_volume) {
+                        if (use_volume_option) {
+                                proc->addArgument("-volume");
+                                proc->addArgument( QString::number( pref->volume ) );
+                        }
+                } else {
+                        if (use_volume_option) {
+                                proc->addArgument("-volume");
+                                // Note: mset.volume may not be right, it can be the volume of the previous video if
+                                // playing a new one, but I think it's better to use anyway the current volume on
+                                // startup than set it to 0 or something.
+                                // The right volume will be set later, when the video starts to play.
+                                proc->addArgument( QString::number( mset.volume ) );
+                        }
                 }
         }
@@ -2019 +2109 @@
                 case TYPE_FILE          : cache = pref->cache_for_files; break;
                 case TYPE_DVD           : cache = pref->cache_for_dvds; 
-#if DVDNAV_SUPPORT
+#if DVDNAV_SUPPORT
                                                           if (file.startsWith("dvdnav:")) cache = 0;
-#endif
+#endif
                                       break;
                 case TYPE_STREAM        : cache = pref->cache_for_streams; break;
@@ -2027 +2117 @@
                 case TYPE_AUDIO_CD      : cache = pref->cache_for_audiocds; break;
                 case TYPE_TV            : cache = pref->cache_for_tv; break;
+
+
+
                 default: cache = 0;
         }
@@ -2312 +2405 @@
         if (pref->use_audio_equalizer) {
                 if (!af.isEmpty()) af += ",";
-                af += "equalizer=" + Helper::equalizerListToString(mset.audio_equalizer);
+                AudioEqualizerList l = pref->global_audio_equalizer ? pref->audio_equalizer : mset.audio_equalizer;
+                af += "equalizer=" + Helper::equalizerListToString(l);
         }
 
@@ -2350 +2444 @@
                 QString basename = f.path() + "/" + f.completeBaseName();
 
-                qDebug("Core::startMplayer: file basename: '%s'", basename.toUtf8().data());
+                qDebug("Core::startMplayer: file basename: '%s'", basename.toUtf8().data());
 
                 if (QFile::exists(basename+".edl")) 
@@ -2419 +2513 @@
         QString line_for_log = commandline + "\n";
         emit logLineAvailable(line_for_log);
-        
+
+#ifdef Q_OS_WIN
+        if (!pref->use_windowsfontdir) {
+                QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+                env.insert("FONTCONFIG_FILE", Paths::configPath() + "/fonts.conf");
+                proc->setProcessEnvironment(env);
+        }
+#endif
         if ( !proc->start() ) {
             // error handling
@@ -2890 +2991 @@
 
 void Core::incBrightness() {
-        setBrightness(mset.brightness + 4);
+        setBrightness(mset.brightness + );
 }
 
 void Core::decBrightness() {
-        setBrightness(mset.brightness - 4);
+        setBrightness(mset.brightness - );
 }
 
 void Core::incContrast() {
-        setContrast(mset.contrast + 4);
+        setContrast(mset.contrast + );
 }
 
 void Core::decContrast() {
-        setContrast(mset.contrast - 4);
+        setContrast(mset.contrast - );
 }
 
 void Core::incGamma() {
-        setGamma(mset.gamma + 4);
+        setGamma(mset.gamma + );
 }
 
 void Core::decGamma() {
-        setGamma(mset.gamma - 4);
+        setGamma(mset.gamma - );
 }
 
 void Core::incHue() {
-        setHue(mset.hue + 4);
+        setHue(mset.hue + );
 }
 
 void Core::decHue() {
-        setHue(mset.hue - 4);
+        setHue(mset.hue - );
 }
 
 void Core::incSaturation() {
-        setSaturation(mset.saturation + 4);
+        setSaturation(mset.saturation + );
 }
 
 void Core::decSaturation() {
-        setSaturation(mset.saturation - 4);
+        setSaturation(mset.saturation - );
 }
 
@@ -3041 +3142 @@
 void Core::incVolume() {
         qDebug("Core::incVolume");
-        int new_vol = (pref->global_volume ? pref->volume + 4 : mset.volume + 4);
+        int new_vol = (pref->global_volume ? pref->volume + );
         setVolume(new_vol);
 }
@@ -3047 +3148 @@
 void Core::decVolume() {
         qDebug("Core::incVolume");
-        int new_vol = (pref->global_volume ? pref->volume - 4 : mset.volume - 4);
+        int new_vol = (pref->global_volume ? pref->volume - );
         setVolume(new_vol);
 }
@@ -3199 +3300 @@
 // Audio equalizer functions
 void Core::setAudioEqualizer(AudioEqualizerList values, bool restart) {
-        mset.audio_equalizer = values;
+        if (pref->global_audio_equalizer) {
+                pref->audio_equalizer = values;
+        } else {
+                mset.audio_equalizer = values;
+        }
 
         if (!restart) {
@@ -3214 +3319 @@
 
 void Core::updateAudioEqualizer() {
-        setAudioEqualizer(mset.audio_equalizer);
+        setAudioEqualizer(pref->global_audio_equalizer ? pref->audio_equalizer : mset.audio_equalizer);
+}
+
+void Core::setAudioEq(int eq, int value) {
+        if (pref->global_audio_equalizer) {
+                pref->audio_equalizer[eq] = value;
+        } else {
+                mset.audio_equalizer[eq] = value;
+        }
+        updateAudioEqualizer();
 }
 
 void Core::setAudioEq0(int value) {
-        mset.audio_equalizer[0] = value;
-        updateAudioEqualizer();
+        setAudioEq(0, value);
 }
 
 void Core::setAudioEq1(int value) {
-        mset.audio_equalizer[1] = value;
-        updateAudioEqualizer();
+        setAudioEq(1, value);
 }
 
 void Core::setAudioEq2(int value) {
-        mset.audio_equalizer[2] = value;
-        updateAudioEqualizer();
+        setAudioEq(2, value);
 }
 
 void Core::setAudioEq3(int value) {
-        mset.audio_equalizer[3] = value;
-        updateAudioEqualizer();
+        setAudioEq(3, value);
 }
 
 void Core::setAudioEq4(int value) {
-        mset.audio_equalizer[4] = value;
-        updateAudioEqualizer();
+        setAudioEq(4, value);
 }
 
 void Core::setAudioEq5(int value) {
-        mset.audio_equalizer[5] = value;
-        updateAudioEqualizer();
+        setAudioEq(5, value);
 }
 
 void Core::setAudioEq6(int value) {
-        mset.audio_equalizer[6] = value;
-        updateAudioEqualizer();
+        setAudioEq(6, value);
 }
 
 void Core::setAudioEq7(int value) {
-        mset.audio_equalizer[7] = value;
-        updateAudioEqualizer();
+        setAudioEq(7, value);
 }
 
 void Core::setAudioEq8(int value) {
-        mset.audio_equalizer[8] = value;
-        updateAudioEqualizer();
+        setAudioEq(8, value);
 }
 
 void Core::setAudioEq9(int value) {
-        mset.audio_equalizer[9] = value;
-        updateAudioEqualizer();
+        setAudioEq(9, value);
 }
 
@@ -3436 +3540 @@
                         // the volume is reduced if using -softvol-max.
 
-                        if (pref->global_volume) {
-                                setVolume( pref->volume, true);
-                                if (pref->mute) mute(true);
+                        if (pref->mplayer_additional_options.contains("-volume")) {
+                                qDebug("Core::changeAudio: don't set volume since -volume is used");
                         } else {
-                                setVolume( mset.volume, true );
-                                if (mset.mute) mute(true); // if muted, mute again
+                                if (pref->global_volume) {
+                                        setVolume( pref->volume, true);
+                                        if (pref->mute) mute(true);
+                                } else {
+                                        setVolume( mset.volume, true );
+                                        if (mset.mute) mute(true); // if muted, mute again
+                                }
                         }
                         updateWidgets();
@@ -3545 +3653 @@
         else
         if (mdat.type == TYPE_DVD) {
-#if DVDNAV_SUPPORT
+#if DVDNAV_SUPPORT
                 if (mdat.filename.startsWith("dvdnav:")) {
                         tellmp("switch_title " + QString::number(ID));
                 } else {
-#endif
+#endif
                         DiscData disc_data = DiscName::split(mdat.filename);
                         disc_data.title = ID;
@@ -3555 +3663 @@
 
                         openDVD( DiscName::join(disc_data) );
-#if DVDNAV_SUPPORT
-                }
-#endif
-        }
+                #if DVDNAV_SUPPORT
+                }
+                #endif
+        }
+#ifdef BLURAY_SUPPORT
+        else
+        if (mdat.type == TYPE_BLURAY) {
+                //DiscName::test();
+
+                DiscData disc_data = DiscName::split(mdat.filename);
+                disc_data.title = ID;
+                QString bluray_url = DiscName::join(disc_data);
+                qDebug("Core::changeTitle: bluray_url: %s", bluray_url.toUtf8().constData());
+                openBluRay(bluray_url);
+        }
+#endif
 }
 
@@ -3680 +3800 @@
       << MediaSettings::Aspect54        // 1.25
       << MediaSettings::Aspect43        // 1.33
+
       << MediaSettings::Aspect1410      // 1.4
       << MediaSettings::Aspect32        // 1.5
@@ -3709 +3830 @@
                         a = 2;
                 // See if we are done
-                if(pref->wheel_function_cycle.testFlag(QFlag(a)))
+                if))
                         done = true;
         }
@@ -4084 +4205 @@
         emit needResize( mset.win_width, mset.win_height );
         */
-        //mplayerwindow->showLogo(TRUE);
+        //mplayerwindow->showLogo();
         emit noVideo();
 }
@@ -4343 +4464 @@
 void Core::durationChanged(double length) {
         qDebug("Core::durationChanged: %f", length);
-        mdat.duration = length;
+        if (mdat.duration != length) {
+                mdat.duration = length;
+                emit newDuration(length);
+        }
 }
 
@@ -4353 +4477 @@
 
 void Core::dvdnavUpdateMousePos(QPoint pos) {
+
         if ((state() == Playing) && (mdat.filename.startsWith("dvdnav:")) && (dvdnav_title_is_menu)) {
                 if (mplayerwindow->videoLayer()->underMouse()) {
-                        QPoint p = mplayerwindow->videoLayer()->mapFromParent(pos);
-                        tellmp(QString("set_mouse_pos %1 %2").arg(p.x()).arg(p.y()));
+                        tellmp(QString("set_mouse_pos %1 %2").arg(pos.x()).arg(pos.y()));
                 }
         }