summaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorChristian Daniel <cd@maintech.de>2013-03-22 11:18:30 +0100
committerChristian Daniel <cd@maintech.de>2013-03-22 11:18:30 +0100
commiteca56e35be841396f6c57bab540a3e1503253d56 (patch)
tree4a0a29cd53a84339e56754c32bf67391c83494fe /main.cpp
parent2c8c930b39fe069b36d81caa00401d9ac182a9d8 (diff)
monster rework
- pluginify whole project - reorganize directory structure - fix PortAudio detection script - implement generic channelizer - fix several OpenGL problems - rework presets - add audio mixing - too many more
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp33
1 files changed, 7 insertions, 26 deletions
diff --git a/main.cpp b/main.cpp
index 3383b1e..cf0872b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -17,28 +17,10 @@
#include <QApplication>
#include <QTextCodec>
-#include <QMessageBox>
#include <QWindowsStyle>
#include "mainwindow.h"
-#include "portaudio.h"
-static void initPortAudio()
-{
- PaError err;
-
- if((err = Pa_Initialize()) != paNoError) {
- qCritical("PortAudio: could not initialise: %s (%d)", Pa_GetErrorText(err), err);
- QString error = QObject::tr("PortAudio could not be initialised: %1 (%2)").arg(Pa_GetErrorText(err)).arg(err);
- QMessageBox::critical(NULL, "PortAudio failure", error);
- }
-}
-
-static void cleanupPortAudio()
-{
- Pa_Terminate();
-}
-
-int main(int argc, char* argv[])
+static int runQtApplication(int argc, char* argv[])
{
QApplication a(argc, argv);
@@ -48,16 +30,15 @@ int main(int argc, char* argv[])
QCoreApplication::setOrganizationName("osmocom");
QCoreApplication::setApplicationName("SDRangelove");
- //QApplication::setStyle(new QWindowsStyle);
-
- initPortAudio();
+ QApplication::setStyle(new QWindowsStyle);
MainWindow w;
w.show();
- int res = a.exec();
-
- cleanupPortAudio();
+ return a.exec();
+}
- return res;
+int main(int argc, char* argv[])
+{
+ return runQtApplication(argc, argv);
}