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

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

smplayer/trunk/src/smplayer.pro

@@ -9 +9 @@
 
 RESOURCES = icons.qrc
-
-INCLUDEPATH += mpcgui
-DEPENDPATH += mpcgui
 
 #DEFINES += EXPERIMENTAL
@@ -19 +16 @@
 DEFINES += YOUTUBE_SUPPORT
 DEFINES += YT_USE_SCRIPT
+DEFINES += BLURAY_SUPPORT
 DEFINES += GUI_CHANGE_ON_RUNTIME
 DEFINES += LOG_MPLAYER
 DEFINES += LOG_SMPLAYER
+DEFINES += MPCGUI
 DEFINES += SKINS
 DEFINES += UPDATE_CHECKER
 DEFINES += CHECK_UPGRADED
+DEFINES += REMINDER_ACTIONS
 #DEFINES += USE_FONTCONFIG_OPTIONS
+
+isEqual(QT_MAJOR_VERSION, 5) {
+        QT += widgets gui
+        #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040000
+        DEFINES -= MPCGUI
+}
 
 contains(QT_VERSION, ^4\\.[0-3]\\..*) {
@@ -110 +116 @@
         languages.h \
         selectcolorbutton.h \
-        simplehttp.h \
         prefwidget.h \
         prefgeneral.h \
@@ -128 +133 @@
         verticaltext.h \
         eqslider.h \
-        videoequalizer2.h \
+        videoequalizer.h \
         audioequalizer.h \
         myslider.h \
@@ -146 +151 @@
         basegui.h \
         baseguiplus.h \
-        floatingwidget.h \
+        autohidewidget.h \
         widgetactions.h \
         toolbareditor.h \
@@ -152 +157 @@
         defaultgui.h \
         minigui.h \
-        mpcgui/mpcgui.h \
-        mpcgui/mpcstyles.h \
         clhelp.h \
         cleanconfig.h \
@@ -209 +212 @@
         languages.cpp \
         selectcolorbutton.cpp \
-        simplehttp.cpp \
         prefwidget.cpp \
         prefgeneral.cpp \
@@ -227 +229 @@
         verticaltext.cpp \
         eqslider.cpp \
-        videoequalizer2.cpp \
+        videoequalizer.cpp \
         audioequalizer.cpp \
         myslider.cpp \
@@ -245 +247 @@
         basegui.cpp \
         baseguiplus.cpp \
-        floatingwidget.cpp \
+        autohidewidget.cpp \
         widgetactions.cpp \
         toolbareditor.cpp \
@@ -251 +253 @@
         defaultgui.cpp \
         minigui.cpp \
-        mpcgui/mpcgui.cpp \
-        mpcgui/mpcstyles.cpp \
         clhelp.cpp \
         cleanconfig.cpp \
@@ -260 +260 @@
 
 FORMS = inputdvddirectory.ui logwindowbase.ui filepropertiesdialog.ui \
-        eqslider.ui seekwidget.ui inputurl.ui videoequalizer2.ui vdpauproperties.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 \
@@ -272 +272 @@
         DEPENDPATH += qtsingleapplication
 
-        SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
-        HEADERS += qtsingleapplication.h qtlocalpeer.h
+        SOURCES += qtsingleapplication/qtsingleapplication.cpp qtsingleapplication/qtlocalpeer.cpp
+        HEADERS += qtsingleapplication/qtsingleapplication.h qtsingleapplication/qtlocalpeer.h
 }
 
@@ -287 +287 @@
         DEPENDPATH += findsubtitles/maia
 
-        HEADERS += findsubtitlesconfigdialog.h findsubtitleswindow.h
-        SOURCES += findsubtitlesconfigdialog.cpp findsubtitleswindow.cpp
-        FORMS += findsubtitleswindow.ui findsubtitlesconfigdialog.ui
+        HEADERS += findsubtitles/findsubtitlesconfigdialog.h findsubtitles/findsubtitleswindow.h
+        SOURCES += findsubtitles/findsubtitlesconfigdialog.cpp findsubtitles/findsubtitleswindow.cpp
+        FORMS += findsubtitles/findsubtitleswindow.ui findsubtitles/findsubtitlesconfigdialog.ui
 
         # xmlrpc client code to connect to opensubtitles.org
-        HEADERS += maiaObject.h maiaFault.h maiaXmlRpcClient.h osclient.h
-        SOURCES += maiaObject.cpp maiaFault.cpp maiaXmlRpcClient.cpp osclient.cpp
+        HEADERS += findsubtitles/maia/maiaObject.h findsubtitles/maia/maiaFault.h findsubtitles/maia/maiaXmlRpcClient.h findsubtitles/osclient.h
+        SOURCES += findsubtitles/maia/maiaObject.cpp findsubtitles/maia/maiaFault.cpp findsubtitles/maia/maiaXmlRpcClient.cpp findsubtitles/osclient.cpp
 }
 
@@ -301 +301 @@
         DEPENDPATH += findsubtitles/filedownloader
 
-        HEADERS += filedownloader.h subchooserdialog.h fixsubs.h
-        SOURCES += filedownloader.cpp subchooserdialog.cpp fixsubs.cpp
-
-        FORMS += subchooserdialog.ui
+        HEADERS += findsubtitles/filedownloader/filedownloader.h findsubtitles/subchooserdialog.h findsubtitles/fixsubs.h
+        SOURCES += findsubtitles/filedownloader/filedownloader.cpp findsubtitles/subchooserdialog.cpp findsubtitles/fixsubs.cpp
+
+        FORMS += findsubtitles/subchooserdialog.ui
 
         contains( DEFINES, USE_QUAZIP ) {
@@ -340 +340 @@
         DEPENDPATH += youtube
 
-        HEADERS += retrieveyoutubeurl.h ytsig.h
-        SOURCES += retrieveyoutubeurl.cpp ytsig.cpp
+        HEADERS += youtube/retrieveyoutubeurl.h youtube/ytsig.h
+        SOURCES += youtube/retrieveyoutubeurl.cpp youtube/ytsig.cpp
 
         contains( DEFINES, YT_USE_SCRIPT ) {
-                HEADERS += codedownloader.h
-                SOURCES += codedownloader.cpp
+                HEADERS += youtube/codedownloader.h
+                SOURCES += youtube/codedownloader.cpp
                 QT += script
-        }
+        } else {
+                #DEFINES += YTSIG_STATIC
+        }
+}
+
+# mpcgui
+contains( DEFINES, MPCGUI ) {
+        INCLUDEPATH += mpcgui
+        DEPENDPATH += mpcgui
+
+        HEADERS += mpcgui/mpcgui.h mpcgui/mpcstyles.h
+        SOURCES += mpcgui/mpcgui.cpp mpcgui/mpcstyles.cpp
 }
 
@@ -355 +366 @@
         DEPENDPATH += skingui
 
-        HEADERS += myicon.h mybutton.h panelseeker.h playcontrol.h \
-               mediapanel.h volumecontrolpanel.h mediabarpanel.h \
-               qpropertysetter.h actiontools.h skingui.h
-        SOURCES += myicon.cpp mybutton.cpp panelseeker.cpp playcontrol.cpp \
-               mediapanel.cpp volumecontrolpanel.cpp mediabarpanel.cpp \
-               qpropertysetter.cpp actiontools.cpp skingui.cpp
-        FORMS += mediapanel.ui mediabarpanel.ui
+        HEADERS += skingui/myicon.h skingui/mybutton.h skingui/panelseeker.h skingui/playcontrol.h \
+               skingui/mediapanel.h skingui/volumecontrolpanel.h skingui/mediabarpanel.h \
+               skingui/qpropertysetter.h skingui/actiontools.h skingui/skingui.h
+        SOURCES += skingui/myicon.cpp skingui/mybutton.cpp skingui/panelseeker.cpp skingui/playcontrol.cpp \
+               skingui/mediapanel.cpp skingui/volumecontrolpanel.cpp skingui/mediabarpanel.cpp \
+               skingui/qpropertysetter.cpp skingui/actiontools.cpp skingui/skingui.cpp
+        FORMS += skingui/mediapanel.ui skingui/mediabarpanel.ui
 }
 
@@ -375 +386 @@
         DEPENDPATH += videopreview
 
-        HEADERS += videopreview.h videopreviewconfigdialog.h
-        SOURCES += videopreview.cpp videopreviewconfigdialog.cpp
-
-        FORMS += videopreviewconfigdialog.ui
+        HEADERS += videopreview/videopreview.h videopreview/videopreviewconfigdialog.h
+        SOURCES += videopreview/videopreview.cpp videopreview/videopreviewconfigdialog.cpp
+
+        FORMS += videopreview/videopreviewconfigdialog.ui
+}
+
+contains( DEFINES, REMINDER_ACTIONS ) {
+        HEADERS += sharedialog.h
+        SOURCES += sharedialog.cpp
+        FORMS += sharedialog.ui
 }
 
@@ -396 +413 @@
 win32 {
         DEFINES += SCREENSAVER_OFF
-        DEFINES += FONTCACHE_DIALOG
+        #DEFINES += AVOID_SCREENSAVER
+        #DEFINES += FONTCACHE_DIALOG
         DEFINES += USE_FONTCONFIG_OPTIONS
 
@@ -468 +486 @@
                translations/smplayer_da.ts translations/smplayer_hr.ts \
                translations/smplayer_he_IL.ts translations/smplayer_th.ts \
-               translations/smplayer_ms_MY.ts
+               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