Changeset 165 for smplayer/trunk/src/prefadvanced.cpp

Timestamp:

May 16, 2014, 9:51:55 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to latest 0.8.7

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/prefadvanced.cpp (modified) (5 diffs)

smplayer/trunk/src/prefadvanced.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
@@ -105 +105 @@
         setPreferIpv4( pref->prefer_ipv4 );
         setUseIdx( pref->use_idx );
+
+        setUseLavfDemuxer(pref->use_lavf_demuxer);
+
         setUseCorrectPts( pref->use_correct_pts );
         setActionsToRun( pref->actions_to_run );
@@ -138 +141 @@
         colorkey_changed = false;
 #endif
+        lavf_demuxer_changed = false;
+
         pref->prefer_ipv4 = preferIpv4();
         TEST_AND_SET(pref->use_idx, useIdx());
+
+        if (pref->use_lavf_demuxer != useLavfDemuxer()) {
+                pref->use_lavf_demuxer = useLavfDemuxer();
+                lavf_demuxer_changed = true;
+                requires_restart = true;
+        }
+
         TEST_AND_SET(pref->use_correct_pts, useCorrectPts());
         pref->actions_to_run = actionsToRun();
@@ -303 +315 @@
 }
 
+void PrefAdvanced::setUseLavfDemuxer(bool b) {
+        lavf_demuxer_check->setChecked(b);
+}
+
+bool PrefAdvanced::useLavfDemuxer() {
+        return lavf_demuxer_check->isChecked();
+}
+
 void PrefAdvanced::setUseCorrectPts(Preferences::OptionState value) {
         correct_pts_combo->setState(value);
@@ -421 +441 @@
            "seeking (i.e. not with stdin, pipe, etc).<br> "
            "<b>Note:</b> the creation of the index may take some time.") );
+
+        setWhatsThis(lavf_demuxer_check, tr("Use the lavf demuxer by default"),
+                tr("If this option is checked, the lavf demuxer will be used for all formats.") +" "+
+                tr("Notice: mplayer2 already uses the lavf demuxer by default so "
+                   "enabling this option with mplayer2 won't have any effect."));
 
 #ifdef Q_OS_WIN