Changeset 181 for smplayer/trunk/src/prefnetwork.cpp

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/prefnetwork.cpp (modified) (4 diffs)

smplayer/trunk/src/prefnetwork.cpp

@@ -53 +53 @@
         connect(streaming_type_combo, SIGNAL(currentIndexChanged(int)), this, SLOT(streaming_type_combo_changed(int)));
 
+#ifndef YOUTUBE_SUPPORT
+        youtube_box->hide();
+#endif
+
         retranslateStrings();
 }
@@ -65 +69 @@
 
 QPixmap PrefNetwork::sectionIcon() {
-        return Images::icon("pref_network", 22);
+        return Images::icon("pref_network");
 }
 
@@ -74 +78 @@
         streaming_type_combo->clear();
         streaming_type_combo->addItem(tr("Disabled"), Preferences::NoStreaming);
-        #if defined(YOUTUBE_SUPPORT) && defined(MPV_SUPPORT)
+        #ifdef MPV_SUPPORT
         streaming_type_combo->addItem(tr("Auto"), Preferences::StreamingAuto);
         #endif
@@ -168 +172 @@
                 "<ul>"
                 "<li><b>" + tr("Disabled") +":</b> " + tr("support for video sites is turned off") +"</li>"+
-                #if defined(YOUTUBE_SUPPORT) && defined(MPV_SUPPORT)
-                "<li><b>" + tr("Auto") +":</b> " + tr("enables internal support for YouTube and uses mpv + youtube-dl for the rest of the sites") +"</li>"+
+                #ifdef MPV_SUPPORT
+                "<li><b>" + tr("Auto") +":</b> " + tr("it will try to use mpv + youtube-dl only for the sites that require it") +"</li>"+
                 #endif
                 #ifdef YOUTUBE_SUPPORT