Split miav server and client apart. Port client to Qt4. Replace libraw1994 with libiec61883. Add unit tests for multiplexer and fix some bugs in it.

1 files changed, 7 insertions, 9 deletions

diff --git a/src/info_gui.cc b/src/info_gui.cc
index cb2e51d..f8072e1 100644
--- a/src/info_gui.cc
+++ b/src/info_gui.cc
@@ -24,9 +24,6 @@
  *    along with MIaV; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#include <config.h>
-#ifdef USE_GUI
-
 #include "info_gui.h"
 
 #include <stdio.h>
@@ -38,9 +35,11 @@ bool InfoEventHandler::eventFilter( QObject *o, QEvent *e )
 {
   if ( e->type() == TYPE_SHOW_MESSAGEBOX ) {
     //    fprintf(stderr, "Custom event!\n"); fflush(stderr);
+    /* // TODO
     MessageBox *msgbox = ((ShowMessageEvent*)e)->messagebox();
     msgbox->exec();
     delete msgbox;
+    */
     return TRUE; // eat event
   } else {
     // standard event processing
@@ -69,7 +68,7 @@ void InfoGui::setParent(QWidget *p)
   parent = p;
 }
 
-void InfoGui::showmsg(char *msg, char *title, msg_icon icon)
+void InfoGui::showmsg(const char *msg, const char *title, msg_icon icon)
 {
   pthread_mutex_lock(&mutex);
   // Beginning of safezone
@@ -86,14 +85,16 @@ void InfoGui::showmsg(char *msg, char *title, msg_icon icon)
 
   MessageBox *msgbox = new MessageBox(parent, 
                                       title,
-                                      msg, 
+                                      msg,
                                       TYPE_OK, 
                                       icon);
+  (void)msgbox;
 
+  /* // TODO
   ShowMessageEvent *event = new ShowMessageEvent( msgbox );
   
   qapp->postEvent(parent, event);
-
+  */
   // End of safezone
   pthread_mutex_unlock(&mutex);
 }
@@ -139,6 +140,3 @@ void InfoGui::info(const char *fmt, ...)
 
   log("Info: %s", buf);
 }
-
-
-#endif/*USE_GUI*/