Shut up some warnings when detecting VapourSynth registry path.

[x264-launcher/x264-launcher.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 4ce7a05..1698961 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2016 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 #include "win_main.h"
 #include "cli.h"
 #include "ipc.h"
-#include "taskbar7.h"
 #include "thread_ipc_send.h"
 
 //MUtils
@@ -145,7 +144,7 @@ static int simple_x264_main(int &argc, char **argv)
        qDebug(" Number of CPU's  :  %d\n", cpuFeatures.count);
 
        //Initialize Qt
-       QScopedPointer<QApplication> application(MUtils::Startup::create_qt(argc, argv, QLatin1String("LameXP - Audio Encoder Front-End")));
+       QScopedPointer<QApplication> application(MUtils::Startup::create_qt(argc, argv, QLatin1String("Simple x264 Launcher")));
        if(application.isNull())
        {
                return EXIT_FAILURE;
@@ -163,14 +162,11 @@ static int simple_x264_main(int &argc, char **argv)
        }
 
        //Running in portable mode?
-       if(x264_portable())
+       if(x264_is_portable())
        {
                qDebug("Application is running in portable mode!\n");
        }
 
-       //Taskbar init
-       WinSevenTaskbar::init();
-
        //Set style
        if(!arguments.contains(CLI_PARAM_NO_GUI_STYLE))
        {
@@ -183,9 +179,6 @@ static int simple_x264_main(int &argc, char **argv)
 
        //Run application
        int ret = qApp->exec();
-
-       //Taskbar uninit
-       WinSevenTaskbar::init();
        
        //Exit program
        return ret;
@@ -197,5 +190,5 @@ static int simple_x264_main(int &argc, char **argv)
 
 int main(int argc, char* argv[])
 {
-       return MUtils::Startup::startup(argc, argv, simple_x264_main, "Simple x264 Launcher", true /*lamexp_version_demo()*/);
+       return MUtils::Startup::startup(argc, argv, simple_x264_main, "Simple x264 Launcher", x264_is_prerelease());
 }