gr-qtgui: removing unnecessary mutex and qtevent objects.

4 files changed, 4 insertions, 31 deletions

diff --git a/gr-qtgui/lib/qtgui_sink_c.cc b/gr-qtgui/lib/qtgui_sink_c.cc
index 405971aa0..bdd941fe1 100644
--- a/gr-qtgui/lib/qtgui_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_sink_c.cc
@@ -71,7 +71,6 @@ qtgui_sink_c::qtgui_sink_c (int fftsize, int wintype,
     fprintf(stderr, "Warning: plotting Waterfall3D has been removed; enabling plotwaterfall3d has no effect.\n");
   }
 
-  gruel::scoped_lock lock(d_mutex);
   d_main_gui = NULL;
 
   // Perform fftshift operation;
@@ -93,7 +92,6 @@ qtgui_sink_c::~qtgui_sink_c()
   delete d_main_gui;
   delete [] d_residbuf;
   delete d_fft;
-  delete d_object;
 }
 
 void
@@ -138,9 +136,6 @@ qtgui_sink_c::initialize(const bool opengl)
 
   // initialize update time to 10 times a second
   set_update_time(0.1);
-
-  d_object = new qtgui_obj(d_qApplication);
-  qApp->postEvent(d_object, new qtgui_event(d_mutex));
 }
 
 
@@ -278,8 +273,6 @@ qtgui_sink_c::general_work (int noutput_items,
   int j=0;
   const gr_complex *in = (const gr_complex*)input_items[0];
 
-  gruel::scoped_lock lock(d_mutex);
-
   // Update the FFT size from the application
   fftresize();
   windowreset();
diff --git a/gr-qtgui/lib/qtgui_sink_c.h b/gr-qtgui/lib/qtgui_sink_c.h
index bcdcf65ae..59b5acfe5 100644
--- a/gr-qtgui/lib/qtgui_sink_c.h
+++ b/gr-qtgui/lib/qtgui_sink_c.h
@@ -28,7 +28,7 @@
 #include <gr_firdes.h>
 #include <gri_fft.h>
 #include <qapplication.h>
-#include <qtgui.h>
+//#include <qtgui.h>
 #include "SpectrumGUIClass.h"
 
 class qtgui_sink_c;
@@ -76,7 +76,7 @@ private:
   double d_bandwidth;
   std::string d_name;
   
-  gruel::mutex d_mutex;
+  //gruel::mutex d_mutex;
 
   bool d_shift;
   gri_fft_complex *d_fft;
@@ -114,7 +114,7 @@ public:
   void set_update_time(double t);
 
   QApplication *d_qApplication;
-  qtgui_obj *d_object;
+  //qtgui_obj *d_object;
 
   int general_work (int noutput_items,
 		    gr_vector_int &ninput_items,
diff --git a/gr-qtgui/lib/qtgui_sink_f.cc b/gr-qtgui/lib/qtgui_sink_f.cc
index 984c2803c..3b3140b5e 100644
--- a/gr-qtgui/lib/qtgui_sink_f.cc
+++ b/gr-qtgui/lib/qtgui_sink_f.cc
@@ -104,16 +104,6 @@ qtgui_sink_f::forecast(int noutput_items, gr_vector_int &ninput_items_required)
   }
 }
 
-void qtgui_sink_f::lock()
-{
-  d_mutex.lock();
-}
-
-void qtgui_sink_f::unlock()
-{
-  d_mutex.unlock();
-}
-
 void
 qtgui_sink_f::initialize(const bool opengl)
 {
@@ -143,9 +133,6 @@ qtgui_sink_f::initialize(const bool opengl)
 
   // initialize update time to 10 times a second
   set_update_time(0.1);
-
-  d_object = new qtgui_obj(d_qApplication);
-  qApp->postEvent(d_object, new qtgui_event(d_mutex));
 }
 
 void
@@ -283,8 +270,6 @@ qtgui_sink_f::general_work (int noutput_items,
   int j=0;
   const float *in = (const float*)input_items[0];
 
-  gruel::scoped_lock lock(d_mutex);
-
   // Update the FFT size from the application
   fftresize();
   windowreset();
diff --git a/gr-qtgui/lib/qtgui_sink_f.h b/gr-qtgui/lib/qtgui_sink_f.h
index d80a6a198..a798a41bb 100644
--- a/gr-qtgui/lib/qtgui_sink_f.h
+++ b/gr-qtgui/lib/qtgui_sink_f.h
@@ -28,7 +28,7 @@
 #include <gr_firdes.h>
 #include <gri_fft.h>
 #include <qapplication.h>
-#include <qtgui.h>
+//#include <qtgui.h>
 #include "SpectrumGUIClass.h"
 
 class qtgui_sink_f;
@@ -74,8 +74,6 @@ private:
   double d_bandwidth;
   std::string d_name;
   
-  gruel::mutex d_mutex;
-
   bool d_shift;
   gri_fft_complex *d_fft;
 
@@ -97,8 +95,6 @@ private:
 public:
   ~qtgui_sink_f();
   void exec_();
-  void lock();
-  void unlock();
   QWidget*  qwidget();
   PyObject* pyqwidget();
 
@@ -114,7 +110,6 @@ public:
   void set_update_time(double t);
 
   QApplication *d_qApplication;
-  qtgui_obj *d_object;
 
   int general_work (int noutput_items,
 		    gr_vector_int &ninput_items,