Changeset 121 for smplayer/vendor/current/src/smplayer.cpp

Timestamp:

Mar 15, 2012, 5:14:10 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer 0.7.1: vendor update

File:

• smplayer/vendor/current/src/smplayer.cpp (modified) (10 diffs)

smplayer/vendor/current/src/smplayer.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -25 +25 @@
 #include "translator.h"
 #include "version.h"
-#include "constants.h"
+#include "config.h"
 #include "myclient.h"
 #include "clhelp.h"
@@ -31 +31 @@
 #include <QDir>
 #include <QApplication>
+#include <QUrl>
 
 #include <stdio.h>
@@ -52 +53 @@
         close_at_end = -1; // Not set
         start_in_fullscreen = -1; // Not set
+        use_control_server = true;
 
         move_gui = false;
@@ -81 +83 @@
                 
                 if (gui_to_use.toLower() == "minigui") 
-                        main_window = new MiniGui(0);
+                        main_window = new MiniGui(use_control_server, 0);
                 else 
                 if (gui_to_use.toLower() == "mpcgui")
-                        main_window = new MpcGui(0);
-                else
-                        main_window = new DefaultGui(0);
+                        main_window = new MpcGui(use_control_server, 0);
+                else
+                        main_window = new DefaultGui(use_control_server, 0);
 
                 if (move_gui) {
@@ -116 +118 @@
         if (!pref->gui.isEmpty()) gui_to_use = pref->gui;
         bool add_to_playlist = false;
-
-        bool is_playlist = false;
 
 #ifdef Q_OS_WIN
@@ -200 +200 @@
                 }
                 else
-                if (argument == "-playlist") {
-                        is_playlist = true;
-                }
-                else
                 if ((argument == "--help") || (argument == "-help") ||
             (argument == "-h") || (argument == "-?") ) 
@@ -226 +222 @@
                 }
                 else
+                if (argument == "-disable-server") {
+                        use_control_server = false;
+                }
+                else
                 if (argument == "-add-to-playlist") {
                         add_to_playlist = true;
@@ -243 +243 @@
                 else {
                         // File
+                        #if QT_VERSION >= 0x040600
+                        QUrl fUrl = QUrl::fromUserInput(argument);
+                        if (fUrl.isValid() && fUrl.scheme().toLower() == "file") {
+                            argument = fUrl.toLocalFile();
+                        }
+                        #endif
                         if (QFile::exists( argument )) {
                                 argument = QFileInfo(argument).absoluteFilePath();
-                        }
-                        if (is_playlist) {
-                                argument = argument + IS_PLAYLIST_TAG;
-                                is_playlist = false;
                         }
                         files_to_play.append( argument );
@@ -346 +348 @@
                         qWarning("SMPlayer::createConfigDirectory: can't create %s", Paths::configPath().toUtf8().data());
                 }
+                // Screenshot folder already created in preferences.cpp if Qt >= 4.4
+                #if QT_VERSION < 0x040400 
                 QString s = Paths::configPath() + "/screenshots";
                 if (!d.mkdir(s)) {
                         qWarning("SMPlayer::createHomeDirectory: can't create %s", s.toUtf8().data());
                 }
+                #endif
         }
 }