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

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/smplayer.pro (modified) (22 diffs)

smplayer/trunk/src/smplayer.pro

@@ -15 +15 @@
 DEFINES += VIDEOPREVIEW
 DEFINES += YOUTUBE_SUPPORT
-DEFINES += YT_USE_SCRIPT
 DEFINES += BLURAY_SUPPORT
 DEFINES += GUI_CHANGE_ON_RUNTIME
 DEFINES += LOG_MPLAYER
 DEFINES += LOG_SMPLAYER
+DEFINES += DEFAULTGUI
+DEFINES += MINIGUI
 DEFINES += MPCGUI
 DEFINES += SKINS
+!os2 {
+DEFINES += MPRIS2
+}
 DEFINES += UPDATE_CHECKER
 DEFINES += CHECK_UPGRADED
-DEFINES += REMINDER_ACTIONS
-#DEFINES += USE_FONTCONFIG_OPTIONS
 !os2 {
 DEFINES += AUTO_SHUTDOWN_PC
+}
+DEFINES += CAPTURE_STREAM
+DEFINES += BOOKMARKS
+DEFINES += MOUSE_GESTURES
+
+!os2 {
+DEFINES += MPV_SUPPORT
+}
+DEFINES += MPLAYER_SUPPORT
+
+# Whether to include support for the obsolete mplayer2 or not
+# (requires MPLAYER_SUPPORT)
+DEFINES += MPLAYER2_SUPPORT
+
+# Note to distro maintainers:
+# By disabling SHARE_ACTIONS or SHARE_WIDGET
+# you're preventing SMPlayer to receive donations and thus
+# SERIOUSLY HURTING THE DEVELOPMENT AND PUTTING
+# AT RISK THE CONTINUATION OF THIS PROJECT
+# Please don't.
+
+DEFINES += SHARE_ACTIONS
+DEFINES += SHARE_WIDGET
+
+
+#DEFINES += SIMPLE_BUILD
+
+contains( DEFINES, SIMPLE_BUILD ) {
+        DEFINES -= SINGLE_INSTANCE
+        DEFINES -= FIND_SUBTITLES
+        DEFINES -= VIDEOPREVIEW
+        DEFINES -= LOG_MPLAYER
+        DEFINES -= LOG_SMPLAYER
+        DEFINES -= MINIGUI
+        DEFINES -= MPCGUI
+        DEFINES -= SKINS
+        DEFINES -= MPRIS2
+        DEFINES -= UPDATE_CHECKER
+        DEFINES -= CHECK_UPGRADED
+        DEFINES -= SHARE_ACTIONS
+        DEFINES -= SHARE_WIDGET
+        DEFINES -= AUTO_SHUTDOWN_PC
+        DEFINES -= BOOKMARKS
 }
 
@@ -34 +79 @@
         #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040000
         DEFINES -= MPCGUI
+        win32 {
+                DEFINES -= MPRIS2
+        }
 }
 
@@ -68 +116 @@
         config.h \
         constants.h \
+        links.h \
         svn_revision.h \
         version.h \
@@ -84 +133 @@
         myprocess.h \
         mplayerversion.h \
-        mplayerprocess.h \
+        playerid.h \
+        playerprocess.h \
         infoprovider.h \
         mplayerwindow.h \
@@ -130 +180 @@
         preftv.h \
         prefupdates.h \
+        prefnetwork.h \
         filepropertiesdialog.h \
         multilineinputdialog.h \
@@ -142 +193 @@
         inputdvddirectory.h \
         inputurl.h \
+        stereo3ddialog.h \
         myaction.h \
         myactiongroup.h \
@@ -152 +204 @@
         tvlist.h \
         favoriteeditor.h \
+        statewidget.h \
         basegui.h \
         baseguiplus.h \
@@ -158 +211 @@
         toolbareditor.h \
         editabletoolbar.h \
-        defaultgui.h \
-        minigui.h \
         clhelp.h \
         cleanconfig.h \
@@ -181 +232 @@
         myprocess.cpp \
         mplayerversion.cpp \
-        mplayerprocess.cpp \
+        playerid.cpp \
+        playerprocess.cpp \
         infoprovider.cpp \
         mplayerwindow.cpp \
@@ -226 +278 @@
         preftv.cpp \
         prefupdates.cpp \
+        prefnetwork.cpp \
         filepropertiesdialog.cpp \
         multilineinputdialog.cpp \
@@ -238 +291 @@
         inputdvddirectory.cpp \
         inputurl.cpp \
+        stereo3ddialog.cpp \
         myaction.cpp \
         myactiongroup.cpp \
@@ -248 +302 @@
         tvlist.cpp \
         favoriteeditor.cpp \
+        statewidget.cpp \
         basegui.cpp \
         baseguiplus.cpp \
@@ -254 +309 @@
         toolbareditor.cpp \
         editabletoolbar.cpp \
-        defaultgui.cpp \
-        minigui.cpp \
         clhelp.cpp \
         cleanconfig.cpp \
@@ -266 +319 @@
         preferencesdialog.ui prefgeneral.ui prefdrives.ui prefinterface.ui \
         prefperformance.ui prefinput.ui prefsubtitles.ui prefadvanced.ui \
-        prefplaylist.ui preftv.ui prefupdates.ui favoriteeditor.ui \
-        about.ui inputmplayerversion.ui errordialog.ui timedialog.ui \
+        prefplaylist.ui preftv.ui prefupdates.ui prefnetwork.ui favoriteeditor.ui \
+        about.ui inputmplayerversion.ui errordialog.ui timedialog.ui stereo3ddialog.ui \
         toolbareditor.ui multilineinputdialog.ui
+
+contains( DEFINES, MPV_SUPPORT ) {
+        HEADERS += mpvprocess.h inforeadermpv.h
+        SOURCES += mpvprocess.cpp inforeadermpv.cpp
+}
+
+contains( DEFINES, MPLAYER_SUPPORT ) {
+        HEADERS += mplayerprocess.h inforeadermplayer.h
+        SOURCES += mplayerprocess.cpp inforeadermplayer.cpp
+}
 
 # qtsingleapplication
@@ -282 +345 @@
 contains( DEFINES, FIND_SUBTITLES ) {
         DEFINES += DOWNLOAD_SUBS
+        DEFINES += OS_SEARCH_WORKAROUND
         #DEFINES += USE_QUAZIP
 
@@ -340 +404 @@
 # Youtube support
 contains( DEFINES, YOUTUBE_SUPPORT ) {
+        DEFINES += YT_USE_SCRIPT
         INCLUDEPATH += youtube
         DEPENDPATH += youtube
 
-        HEADERS += youtube/retrieveyoutubeurl.h youtube/ytsig.h
-        SOURCES += youtube/retrieveyoutubeurl.cpp youtube/ytsig.cpp
+        HEADERS += youtube/retrieveyoutubeurl.h youtube/loadpage.h
+        SOURCES += youtube/retrieveyoutubeurl.cpp youtube/loadpage.cpp
 
         contains( DEFINES, YT_USE_SCRIPT ) {
-                HEADERS += youtube/codedownloader.h
-                SOURCES += youtube/codedownloader.cpp
+                DEFINES += YT_USE_SIG
+                DEFINES += YT_USE_YTSIG
                 QT += script
-        } else {
-                #DEFINES += YTSIG_STATIC
-        }
+        }
+
+        contains( DEFINES, YT_USE_SIG ) {
+                HEADERS += youtube/sig.h
+                SOURCES += youtube/sig.cpp
+        }
+
+        contains( DEFINES, YT_USE_YTSIG ) {
+                HEADERS += youtube/ytsig.h youtube/codedownloader.h
+                SOURCES += youtube/ytsig.cpp youtube/codedownloader.cpp
+        }
+}
+
+# defaultgui
+contains( DEFINES, DEFAULTGUI ) {
+        HEADERS += defaultgui.h
+        SOURCES += defaultgui.cpp
+}
+
+# minigui
+contains( DEFINES, MINIGUI ) {
+        HEADERS += minigui.h
+        SOURCES += minigui.cpp
 }
 
@@ -378 +463 @@
 }
 
+contains( DEFINES, MPRIS2 ) {
+        INCLUDEPATH += mpris2
+        DEPENDPATH += mpris2
+
+        HEADERS += mpris2/mediaplayer2.h mpris2/mediaplayer2player.h mpris2/mpris2.h
+        SOURCES += mpris2/mediaplayer2.cpp mpris2/mediaplayer2player.cpp mpris2/mpris2.cpp
+
+        QT += dbus
+}
+
 # Update checker
 contains( DEFINES, UPDATE_CHECKER ) {
-        HEADERS += updatechecker.h
-        SOURCES += updatechecker.CPP
+        HEADERS += updatechecker.h updatecheckerdata.h
+        SOURCES += updatechecker.cpp updatecheckerdata.cpp
 }
 
@@ -395 +490 @@
 }
 
-contains( DEFINES, REMINDER_ACTIONS ) {
+
+!contains(DEFINES, SHARE_ACTIONS) | !contains(DEFINES, SHARE_WIDGET) {
+        message("Note to distro maintainers:")
+        message("By disabling SHARE_ACTIONS or SHARE_WIDGET")
+        message("you're preventing SMPlayer to receive donations and thus")
+        message("SERIOUSLY HURTING THE DEVELOPMENT AND PUTTING")
+        message("AT RISK THE CONTINUATION OF THIS PROJECT")
+        message("Please don't.")
+}
+
+contains( DEFINES, SHARE_ACTIONS ) {
         HEADERS += sharedialog.h
         SOURCES += sharedialog.cpp
         FORMS += sharedialog.ui
+}
+
+contains( DEFINES, SHARE_WIDGET|SHARE_ACTIONS ) {
+        HEADERS += sharewidget.h sharedata.h
+        SOURCES += sharewidget.cpp sharedata.cpp
 }
 
@@ -407 +517 @@
 
         unix { QT += dbus }
+}
+
+contains( DEFINES, BOOKMARKS ) {
+        HEADERS += inputbookmark.h bookmarkdialog.h
+        SOURCES += inputbookmark.cpp bookmarkdialog.cpp
+        FORMS += inputbookmark.ui bookmarkdialog.ui
 }
 
@@ -426 +542 @@
         DEFINES += AVOID_SCREENSAVER
         #DEFINES += FONTCACHE_DIALOG
-        DEFINES += USE_FONTCONFIG_OPTIONS
+        #DEFINES += FONTS_HACK
 
         contains( DEFINES, SCREENSAVER_OFF ) {
@@ -474 +590 @@
         DEF_FILE_VENDOR = bww bitwise works GmbH
         DEF_FILE_VERSION = $$APPLICATION_VERSION
-        DEF_FILE_DESCRIPTION = eCS (OS/2) port of SMPlayer
+        DEF_FILE_DESCRIPTION = OS/2 and OS/2-based systems port of SMPlayer
 }
 
@@ -500 +616 @@
                translations/smplayer_ms_MY.ts translations/smplayer_uz.ts \
                translations/smplayer_nn_NO.ts translations/smplayer_id.ts \
-               translations/smplayer_ar.ts translations/smplayer_en_GB.ts
+               translations/smplayer_ar.ts translations/smplayer_en_GB.ts \
+               translations/smplayer_sq_AL.ts translations/smplayer_am.ts \
+               translations/smplayer_fa.ts
+