cleanup

[kdenlive] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 25e1d43e27a741ccc63655366c7d5faf380fcd7c..d42cf79958c384e88e29e354dce011b10ebf45f2 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,22 +18,29 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
+#include "kdenlive-config.h"
+#include "mainwindow.h"
+
 #include <KApplication>
 #include <KAboutData>
 #include <KDebug>
 #include <KCmdLineArgs>
 #include <KUrl> //new
 
-#include "mainwindow.h"
 
-int main(int argc, char *argv[]) {
+#if defined(__APPLE_KDE__) || defined(__DARWIN__)
+#include <SDL/SDL.h>
+#endif
+
+int main(int argc, char *argv[])
+{
     KAboutData aboutData(QByteArray("kdenlive"), QByteArray("kdenlive"),
-                         ki18n("Kdenlive"), QByteArray("0.7"),
+                         ki18n("Kdenlive"), VERSION,
                          ki18n("An open source video editor."),
                          KAboutData::License_GPL,
                          ki18n("Copyright (c) 2008 Development team"));
-    aboutData.addAuthor(ki18n("Jean-Baptiste Mardelle"), ki18n("Mlt porting, KDE4 porting, Main developer"), "jb@kdenlive.org");
-    aboutData.addAuthor(ki18n("Marco Gittler"), ki18n("Mlt Connection, Transition, Effect, Timeline Developer"), "g.marco@freenet.de");
+    aboutData.addAuthor(ki18n("Jean-Baptiste Mardelle"), ki18n("MLT porting, KDE4 porting, Main developer"), "jb@kdenlive.org");
+    aboutData.addAuthor(ki18n("Marco Gittler"), ki18n("MLT Connection, Transition, Effect, Timeline Developer"), "g.marco@freenet.de");
     aboutData.setHomepage("http://kdenlive.org");
     aboutData.setCustomAuthorText(ki18n("Please report bugs to http://kdenlive.org/mantis"), ki18n("Please report bugs to <a href=\"http://kdenlive.org/mantis\">http://kdenlive.org/mantis</a>"));
     aboutData.setTranslator(ki18n("NAME OF TRANSLATORS"), ki18n("EMAIL OF TRANSLATORS"));
@@ -64,11 +71,12 @@ int main(int argc, char *argv[]) {
         KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); //new
 
         QString mltPath = args->getOption("mlt-path");
-        MainWindow* window = new MainWindow(mltPath);
-        window->show();
-        if (args->count()) { //new
-            window->openFile(args->url(0)); //new
+        KUrl url;
+        if (args->count()) {
+            url = args->url(0);
         }
+        MainWindow* window = new MainWindow(mltPath, url);
+        window->show();
 
         args->clear();
     }