From 06da0a913c2c2ebaf7f32c0c20a6c316438bdeeb Mon Sep 17 00:00:00 2001
From: corne lukken <corne.lukken@hotmail.com>
Date: Tue, 26 May 2015 16:37:15 +0200
Subject: [PATCH] made OnMessage a bit cleaner, problably shoudl move to
 /visual

---
 src/CubicSDR.cpp | 18 +++++++++---------
 src/CubicSDR.h   |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/CubicSDR.cpp b/src/CubicSDR.cpp
index cc208ff..25fb29f 100644
--- a/src/CubicSDR.cpp
+++ b/src/CubicSDR.cpp
@@ -81,25 +81,20 @@ bool CubicSDR::OnInit() {
                 devName.append(" (In Use?)");
             }
             choices.Add(devName);
-        }
-
+        } 
         int devId = wxGetSingleChoiceIndex(wxT("Devices"), wxT("Choose Input Device"), choices);
 
         std::cout << "Chosen: " << devId << std::endl;
         sdrThread->setDeviceId(devId);
-    } 
+    } else {
+        OnMessage("no devices found!", "warning");
+    }
 
     t_PostSDR = new std::thread(&SDRPostThread::threadMain, sdrPostThread);
     t_SDR = new std::thread(&SDRThread::threadMain, sdrThread);
 
     appframe = new AppFrame();
 
-    if(devs.size() == 0) {
-        // appframe->OnMessage("no devices found!", "warning");
-        wxMessageDialog *message = new wxMessageDialog(NULL, wxT("no devices found"), wxT("warning"), wxOK | wxICON_ERROR );
-        message->ShowModal();
-    }
-
 #ifdef __APPLE__
     int main_policy;
     struct sched_param main_param;
@@ -293,3 +288,8 @@ void CubicSDR::setFrequencySnap(int snap) {
 int CubicSDR::getFrequencySnap() {
     return snap;
 }
+
+void CubicSDR::OnMessage(std::string text, std::string title) {
+    wxMessageDialog *message = new wxMessageDialog(NULL, wxString::Format(text.c_str()), wxString::Format(title.c_str()), wxOK | wxICON_ERROR );
+    message->ShowModal();
+}
\ No newline at end of file
diff --git a/src/CubicSDR.h b/src/CubicSDR.h
index 2d84af1..aee8fb2 100644
--- a/src/CubicSDR.h
+++ b/src/CubicSDR.h
@@ -62,6 +62,8 @@ public:
 
     void showFrequencyInput();
 
+    void OnMessage(std::string message, std::string title);
+
 private:
     AppFrame *appframe;
     AppConfig config;