[vlmc-devel] commit: main: Register metatypes for both windows and linux, for both gui and server modes. ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Mon Sep  6 17:10:40 2010 +0200| [cef6d735145d3cafd14b65033b5f390e25967435] | committer: Hugo Beauzée-Luyssen 

main: Register metatypes for both windows and linux, for both gui and server modes.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=cef6d735145d3cafd14b65033b5f390e25967435
---

 src/Main/guimain.cpp |    5 +++++
 src/Main/main.cpp    |    4 ++--
 src/Main/vlmc.cpp    |    3 ---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Main/guimain.cpp b/src/Main/guimain.cpp
index 111df2a..3cc7499 100644
--- a/src/Main/guimain.cpp
+++ b/src/Main/guimain.cpp
@@ -31,6 +31,7 @@
 #include "project/GuiProjectManager.h"
 #include "IntroDialog.h"
 #include "LanguageHelper.h"
+#include "Types.h"
 
 #include <QApplication>
 #include <QSettings>
@@ -61,6 +62,10 @@ VLMCmain( int argc, char **argv )
     app.setOrganizationDomain( "vlmc.org" );
     app.setApplicationVersion( PROJECT_VERSION );
 
+    qRegisterMetaType<Workflow::TrackType>( "Workflow::TrackType" );
+    qRegisterMetaType<Vlmc::FrameChangedReason>( "Vlmc::FrameChangedReason" );
+    qRegisterMetaType<QVariant>( "QVariant" );
+
     QSettings s;
     LanguageHelper::getInstance()->languageChanged(
             s.value( "general/VLMCLang", "default" ) );
diff --git a/src/Main/main.cpp b/src/Main/main.cpp
index f83111a..ed10e74 100644
--- a/src/Main/main.cpp
+++ b/src/Main/main.cpp
@@ -46,8 +46,8 @@ VLMCmain( int argc, char **argv )
     app.setOrganizationDomain( "vlmc.org" );
     app.setApplicationVersion( PROJECT_VERSION );
 
-    qRegisterMetaType<MainWorkflow::TrackType>( "MainWorkflow::TrackType" );
-    qRegisterMetaType<MainWorkflow::FrameChangedReason>( "MainWorkflow::FrameChangedReason" );
+    qRegisterMetaType<Workflow::TrackType>( "Workflow::TrackType" );
+    qRegisterMetaType<Vlmc::FrameChangedReason>( "Vlmc::FrameChangedReason" );
     qRegisterMetaType<QVariant>( "QVariant" );
 
     if ( app.arguments().count() < 3 )
diff --git a/src/Main/vlmc.cpp b/src/Main/vlmc.cpp
index f197a9a..a7efc93 100644
--- a/src/Main/vlmc.cpp
+++ b/src/Main/vlmc.cpp
@@ -66,9 +66,6 @@ void    signalHandler( int sig )
 
 int     main( int argc, char **argv )
 {
-    qRegisterMetaType<Workflow::TrackType>( "Workflow::TrackType" );
-    qRegisterMetaType<Vlmc::FrameChangedReason>( "Vlmc::FrameChangedReason" );
-    qRegisterMetaType<QVariant>( "QVariant" );
 #ifdef WITH_CRASHHANDLER
     while ( true )
     {