64-bit Mac build

ETCLabs · May 4, 2018 · 2846095 · 2846095
1 parent 2deaba7
commit 2846095
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 51 deletions.
diff --git a/Info.plist b/Info.plist
@@ -24,7 +24,7 @@
 	<key>CFBundleIconFile</key>
 	<string>eos.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.etc.OSCRouter</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>

diff --git a/OSCRouter.xcodeproj/project.pbxproj b/OSCRouter.xcodeproj/project.pbxproj
diff --git a/OSCRouter/MainWindow.cpp b/OSCRouter/MainWindow.cpp
@@ -33,7 +33,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#define APP_VERSION					"0.9"
+#define APP_VERSION					"0.10"
 #define SETTING_LOG_DEPTH			"LogDepth"
 #define SETTING_FILE_DEPTH			"FileDepth"
 #define SETTING_LAST_FILE			"LastFile"
@@ -1543,7 +1543,7 @@ MainWindow::MainWindow(QWidget* parent/*=0*/, Qt::WindowFlags f/*=0*/)
 		if( !m_Platform->Initialize(error) )
 		{
 			m_Log.AddError("platform initialization failed");
-			m_Platform->Shutdown();
+            delete m_Platform;
 			m_Platform = 0;
 		}
 	}
@@ -1616,7 +1616,6 @@ MainWindow::~MainWindow()
 {
 	if( m_Platform )
 	{
-		m_Platform->Shutdown();
 		delete m_Platform;
 		m_Platform = 0;
 	}
@@ -1671,9 +1670,8 @@ void MainWindow::FlushLogQ(EosLog::LOG_Q &logQ)
 		{
 			const EosLog::sLogMsg logMsg = *i;
 
-			//tm *t = localtime( &logMsg.timestamp );
-                        QDateTime dt;
-                        dt.setTime_t(logMsg.timestamp);
+            QDateTime dt;
+            dt.setTime_t(static_cast<uint>(logMsg.timestamp));
 			QString msgText;
 			if( logMsg.text.c_str() )
 				msgText = QString::fromUtf8( logMsg.text.c_str() );

diff --git a/OSCRouter/Router.cpp b/OSCRouter/Router.cpp
@@ -445,7 +445,7 @@ bool EosTcpClientThread::SendFramed(const EosPacket &packet)
 		char *frame = OSCStream::CreateFrame(m_FrameMode, packet.GetDataConst(), frameSize);
 		if( frame )
 		{
-			m_SendQ.push_back( EosPacket(frame,frameSize) );
+			m_SendQ.push_back( EosPacket(frame,static_cast<int>(frameSize)) );
 			m_Mutex.unlock();
 			delete[] frame;
 			return true;

diff --git a/OSCRouter/main.cpp b/OSCRouter/main.cpp
@@ -41,18 +41,14 @@ int main(int argc, char* argv[])
 
 	EosTimer::Init();
 
+	QApplication app(argc, argv);
+
 #ifndef WIN32
-	if(argc > 0)
-	{
-		QDir dir( argv[0] );
-		dir.cdUp();
-		dir.cdUp();
-		dir.cd("Plugins");
-		QCoreApplication::setLibraryPaths( QStringList(dir.canonicalPath()) );
-	}
+    QDir dir( app.applicationDirPath() );
+    dir.cdUp();
+    dir.cd("Plugins");
+    app.setLibraryPaths( QStringList(dir.canonicalPath()) );
 #endif
-
-	QApplication app(argc, argv);
 
 	app.setDesktopSettingsAware(false);
 	app.setStyle( QStyleFactory::create("Fusion") );