Changeset 181 for smplayer/trunk/src/smplayer.pro

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/smplayer.pro (modified) (16 diffs)

smplayer/trunk/src/smplayer.pro

@@ -16 +16 @@
 DEFINES += YOUTUBE_SUPPORT
 DEFINES += BLURAY_SUPPORT
+DEFINES += TV_SUPPORT
 DEFINES += GUI_CHANGE_ON_RUNTIME
 DEFINES += LOG_MPLAYER
@@ -34 +35 @@
 DEFINES += BOOKMARKS
 DEFINES += MOUSE_GESTURES
+DEFINES += GLOBALSHORTCUTS
 
 !os2 {
@@ -54 +56 @@
 DEFINES += SHARE_WIDGET
 
+# If Qt >= 5.4
+greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 3) {
+        DEFINES += HDPI_SUPPORT
+}
 
 #DEFINES += SIMPLE_BUILD
+#DEFINES += IDOPT_BUILD
 
 contains( DEFINES, SIMPLE_BUILD ) {
@@ -73 +80 @@
         DEFINES -= AUTO_SHUTDOWN_PC
         DEFINES -= BOOKMARKS
+        DEFINES -= TV_SUPPORT
+}
+
+contains( DEFINES, IDOPT_BUILD ) {
+        DEFINES -= MPCGUI
+        DEFINES -= SKINS
+        DEFINES -= CAPTURE_STREAM
+        DEFINES -= TV_SUPPORT
+        DEFINES -= MPLAYER_SUPPORT
+        DEFINES -= MPLAYER2_SUPPORT
 }
 
@@ -78 +95 @@
         QT += widgets gui
         #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040000
-        DEFINES -= MPCGUI
         win32 {
                 DEFINES -= MPRIS2
@@ -110 +126 @@
                 DEFINES -= UPDATE_CHECKER
                 message("UPDATE_CHECKER disabled.")
+        }
+}
+
+contains( DEFINES, GLOBALSHORTCUTS ) {
+        lessThan(QT_MAJOR_VERSION, 5) {
+                DEFINES -= GLOBALSHORTCUTS
+                message("GLOBALSHORTCUTS requires Qt 5. Disabled.")
         }
 }
@@ -147 +170 @@
         filesettingshash.h \
         filehash.h \
-        tvsettings.h \
         images.h \
         inforeader.h \
@@ -154 +176 @@
         urlhistory.h \
         core.h \
+        myscroller.h \
         logwindow.h \
+        infowindow.h \
         infofile.h \
         seekwidget.h \
@@ -178 +202 @@
         prefadvanced.h \
         prefplaylist.h \
-        preftv.h \
         prefupdates.h \
         prefnetwork.h \
@@ -202 +225 @@
         timedialog.h \
         favorites.h \
-        tvlist.h \
         favoriteeditor.h \
         statewidget.h \
@@ -245 +267 @@
         filesettingshash.cpp \
         filehash.cpp \
-        tvsettings.cpp \
         images.cpp \
         inforeader.cpp \
@@ -252 +273 @@
         urlhistory.cpp \
         core.cpp \
+        myscroller.cpp \
         logwindow.cpp \
+        infowindow.cpp \
         infofile.cpp \
         seekwidget.cpp \
@@ -276 +299 @@
         prefadvanced.cpp \
         prefplaylist.cpp \
-        preftv.cpp \
         prefupdates.cpp \
         prefnetwork.cpp \
@@ -300 +322 @@
         timedialog.cpp \
         favorites.cpp \
-        tvlist.cpp \
         favoriteeditor.cpp \
         statewidget.cpp \
@@ -315 +336 @@
         main.cpp
 
-FORMS = inputdvddirectory.ui logwindowbase.ui filepropertiesdialog.ui \
+FORMS = inputdvddirectory.ui logwindow.ui infowindow.ui filepropertiesdialog.ui \
         eqslider.ui seekwidget.ui inputurl.ui videoequalizer.ui vdpauproperties.ui \
         preferencesdialog.ui prefgeneral.ui prefdrives.ui prefinterface.ui \
         prefperformance.ui prefinput.ui prefsubtitles.ui prefadvanced.ui \
-        prefplaylist.ui preftv.ui prefupdates.ui prefnetwork.ui favoriteeditor.ui \
+        prefplaylist.ui prefupdates.ui prefnetwork.ui favoriteeditor.ui \
         about.ui inputmplayerversion.ui errordialog.ui timedialog.ui stereo3ddialog.ui \
         toolbareditor.ui multilineinputdialog.ui
+
+contains( DEFINES, TV_SUPPORT ) {
+        HEADERS += tvlist.h preftv.h tvsettings.h
+        SOURCES += tvlist.cpp preftv.cpp tvsettings.cpp
+        FORMS += preftv.ui
+}
 
 contains( DEFINES, MPV_SUPPORT ) {
@@ -523 +550 @@
         SOURCES += inputbookmark.cpp bookmarkdialog.cpp
         FORMS += inputbookmark.ui bookmarkdialog.ui
+}
+
+contains( DEFINES, GLOBALSHORTCUTS ) {
+        HEADERS += globalshortcuts/globalshortcuts.h
+        SOURCES += globalshortcuts/globalshortcuts.cpp
+        unix {
+                QT += gui-private
+                LIBS += $${QMAKE_LIBS_X11}
+        }
+}
+
+contains( DEFINES, HDPI_SUPPORT ) {
+        HEADERS += hdpisupport.h
+        SOURCES += hdpisupport.cpp
 }