Successful two-way move between Gtk+ and rest of code

Author: keithw

Makefile

@@ -1,5 +1,5 @@
-source = ahab.cpp es.cpp mpegheader.cpp bitreader.cpp startfinder.cpp sequence.cpp extensions.cpp exceptions.cpp picture.cpp slice.cpp file.cpp ogl.cpp slicedecode.cpp idct_mmx.cpp motion_comp_mmx.cpp framebuffer.cpp opq.cpp displayop.cpp controller.cpp displayopq.cpp decoder.cpp decoderop.cpp decoderopq.cpp xeventloop.cpp slicerow.cpp benchmark.cpp decodeengine.cpp readythreadq.cpp decoderjobq.cpp framequeue.cpp
-objects = es.o mpegheader.o bitreader.o startfinder.o sequence.o extensions.o exceptions.o picture.o slice.o file.o ogl.o slicedecode.o idct_mmx.o motion_comp_mmx.o framebuffer.o opq.o displayop.o controller.o displayopq.o decoder.o decoderop.o decoderopq.o xeventloop.o slicerow.o decodeengine.o readythreadq.o decoderjobq.o framequeue.o
+source = ahab.cpp benchmark.cpp bitreader.cpp controller.cpp decodeengine.cpp decoder.cpp decoderop.cpp displayop.cpp es.cpp exceptions.cpp extensions.cpp file.cpp framebuffer.cpp idct_mmx.cpp motion_comp_mmx.cpp mpegheader.cpp ogl.cpp opq.cpp picture.cpp queue_templates.cpp sequence.cpp slice.cpp slicedecode.cpp slicerow.cpp startfinder.cpp xeventloop.cpp controllerop.cpp
+objects = bitreader.o controller.o decodeengine.o decoder.o decoderop.o displayop.o es.o exceptions.o extensions.o file.o framebuffer.o idct_mmx.o motion_comp_mmx.o mpegheader.o ogl.o opq.o picture.o queue_templates.o sequence.o slice.o slicedecode.o slicerow.o startfinder.o xeventloop.o controllerop.o
 executables = ahab benchmark
 
 CPP = g++

ahab.cpp

@@ -9,8 +9,6 @@
 #include "file.hpp"
 #include "es.hpp"
 #include "ogl.hpp"
-#include "framebuffer.hpp"
-#include "colorimetry.hpp"
 #include "decoder.hpp"
 #include "xeventloop.hpp"
 
@@ -72,6 +70,8 @@ int main( int argc, char *argv[] )
   xevents->get_key_queue()->hookup( decoder->get_queue() );
   xevents->get_repaint_queue()->hookup( display->get_queue() );
 
+  decoder->get_output_queue()->hookup( controller->get_input_queue() );
+
   try {
     decoder->wait_shutdown();
   } catch ( UnixAssertError *e ) {

controller.cpp

@@ -2,6 +2,7 @@
 #include "exceptions.hpp"
 #include "decoderop.hpp"
 #include "mutexobj.hpp"
+#include "controllerop.hpp"
 
 #include <stdio.h>
 
@@ -16,12 +17,36 @@ static void *thread_helper( void *controller )
 Controller::Controller( uint s_num_frames )
   : quit_signal( NULL ),
     opq( 0 ),
+    inputq( 0 ),
     num_frames( s_num_frames )
 {
   unixassert( pthread_mutex_init( &mutex, NULL ) );
   pthread_create( &thread_handle, NULL, thread_helper, this );
 }
 
+void Controller::move( void ) {
+  ControllerOperation *op = inputq.dequeue( false );
+  if ( op ) {
+    op->execute( state );
+    delete op;
+  }
+}
+
+void tick_move_slider_helper( void *obj )
+{
+  Controller *me = static_cast<Controller *>( obj );
+  ahabassert( me );
+  me->tick_move_slider();
+}
+
+void Controller::tick_move_slider( void )
+{
+  MutexLock x( &mutex );
+  if ( state.move_slider ) {
+    (*state.move_slider)();
+  }
+}
+
 void Controller::loop( void )
 {
   main = new Gtk::Main( 0, NULL );
@@ -30,24 +55,28 @@ void Controller::loop( void )
   {
     MutexLock x( &mutex );
     quit_signal = new Glib::Dispatcher;
-  }
+    state.move_slider = new Glib::Dispatcher;
 
-  window->set_default_size( 600, 50 );
-  window->set_title( "Ahab Controller" );
+    window->set_default_size( 600, 50 );
+    window->set_title( "Ahab Controller" );
 
-  scale = new Gtk::HScale( 0, num_frames, 1 );
-  window->add( *scale );
+    state.scale = new Gtk::HScale( 0, num_frames, 1 );
+    window->add( *state.scale );
 
-  scale->set_update_policy( Gtk::UPDATE_CONTINUOUS );
-  scale->set_digits( 0 );
-  scale->set_value_pos( Gtk::POS_TOP );
-  scale->set_draw_value();
+    state.scale->set_update_policy( Gtk::UPDATE_CONTINUOUS );
+    state.scale->set_digits( 0 );
+    state.scale->set_value_pos( Gtk::POS_TOP );
+    state.scale->set_draw_value();
 
-  scale->signal_change_value().connect( sigc::mem_fun( this, &Controller::on_changed_value ) );
+    state.scale->signal_change_value().connect( sigc::mem_fun( this, &Controller::on_changed_value ) );
 
-  quit_signal->connect( sigc::mem_fun( this, &Controller::shutdown ) );
+    quit_signal->connect( sigc::mem_fun( this, &Controller::shutdown ) );
+    state.move_slider->connect( sigc::mem_fun( this, &Controller::move ) );
 
-  scale->show();
+    inputq.set_enqueue_callback( tick_move_slider_helper, this );
+
+    state.scale->show();
+  }
 
   main->run( *window );
 
@@ -63,7 +92,7 @@ void Controller::loop( void )
     opq.enqueue( op );
   } catch ( UnixAssertError *e ) {}
 
-  delete scale;
+  delete state.scale;
   delete window;
   delete main;
 }
@@ -90,6 +119,7 @@ Controller::~Controller()
       (*quit_signal)();
     }
   }
+
   unixassert( pthread_join( thread_handle, NULL ) );
   unixassert( pthread_mutex_destroy( &mutex ) );
 }

controller.hpp

@@ -5,22 +5,31 @@
 #include <pthread.h>
 
 #include "decoderop.hpp"
+#include "controllerop.hpp"
+
+class ControllerState {
+public:
+  Glib::Dispatcher *move_slider;
+  Gtk::HScale *scale;
+};
 
 class Controller {
 private:
   Gtk::Main *main;
   Gtk::Window *window;
-  Gtk::HScale *scale;
 
   pthread_mutex_t mutex;
   pthread_t thread_handle;
 
   bool on_changed_value( Gtk::ScrollType scroll, double new_value );
   void shutdown( void ) { main->quit(); }
+  void move( void );
 
   Glib::Dispatcher *quit_signal;
+  ControllerState state;
 
   Queue<DecoderOperation> opq;
+  Queue<ControllerOperation> inputq;
 
   int num_frames;
 
@@ -30,6 +39,9 @@ class Controller {
 
   void loop( void );
   Queue<DecoderOperation> *get_queue() { return &opq; }
+  Queue<ControllerOperation> *get_input_queue() { return &inputq; }
+
+  void tick_move_slider( void );
 };
 
 #endif

controllerop.cpp

@@ -0,0 +1,14 @@
+#include "controller.hpp"
+#include "controllerop.hpp"
+
+void MoveSlider::execute( ControllerState &state )
+{
+  state.scale->set_value( picture_number );
+
+  /* Gtk+ doesn't redraw the number (value) unless the position
+     of the slider changes or it gets exposed! This looks like
+     a bug since we can even get partial numerals! */
+
+  state.scale->hide();
+  state.scale->show();
+}

controllerop.hpp

@@ -0,0 +1,24 @@
+#ifndef CONTROLLEROP_HPP
+#define CONTROLLEROP_HPP
+
+#include <pthread.h>
+
+class ControllerState;
+
+class ControllerOperation {
+public:
+  virtual void execute( ControllerState &state ) = 0;
+  virtual ~ControllerOperation() {}
+};
+
+class MoveSlider : public ControllerOperation {
+private:
+  int picture_number;
+  
+public:
+  MoveSlider( int s_picture_number ) : picture_number( s_picture_number ) {}
+  ~MoveSlider() {}
+  void execute( ControllerState &state );
+};
+
+#endif

decoder.hpp

@@ -11,6 +11,7 @@ class DisplayOperation;
 
 #include "opq.hpp"
 #include "decodeengine.hpp"
+#include "controllerop.hpp"
 
 class DecoderState {
 public:
@@ -19,6 +20,7 @@ class DecoderState {
   bool live;
   OpenGLDisplay *display;
   Queue<DisplayOperation> *oglq;
+  Queue<ControllerOperation> outputq;
 };
 
 class Decoder {
@@ -38,6 +40,7 @@ class Decoder {
 
   void loop();
   Queue<DecoderOperation> *get_queue() { return &opq; }
+  Queue<ControllerOperation> *get_output_queue() { return &state.outputq; }
   void wait_shutdown( void );
 };
 

decoderjobq.cpp

@@ -18,9 +18,13 @@ void XKey::execute( DecoderState &state )
     break;
   case XK_Left:
     state.current_picture--;
+    state.outputq.flush();
+    state.outputq.enqueue( new MoveSlider( state.current_picture ) );
     break;
   case XK_Right:
     state.current_picture++;
+    state.outputq.flush();
+    state.outputq.enqueue( new MoveSlider( state.current_picture ) );
     break;
   default:
     fprintf( stderr, "key %d hit\n", key );

decoderjobq.hpp

@@ -1,3 +1,6 @@
+#ifndef OPQ_CPP
+#define OPQ_CPP
+
 #include <pthread.h>
 
 #include "opq.hpp"
@@ -13,13 +16,23 @@ Queue<T>::Queue( int s_max_size )
     max_size( s_max_size ),
     head( NULL ),
     tail( NULL ),
-    output( NULL )
+    output( NULL ),
+    enqueue_callback( NULL )
 {
   unixassert( pthread_mutex_init( &mutex, NULL ) );
   unixassert( pthread_cond_init( &write_activity, NULL ) );
   unixassert( pthread_cond_init( &read_activity, NULL ) );
 }
 
+template <class T>
+void Queue<T>::set_enqueue_callback( void (*s_enqueue_callback)(void *obj),
+				     void *s_obj)
+{
+  MutexLock x( &mutex );
+  enqueue_callback = s_enqueue_callback;
+  obj = s_obj;
+}
+
 template <class T>
 Queue<T>::~Queue()
 {
@@ -73,6 +86,10 @@ QueueElement<T> *Queue<T>::enqueue( T *h )
 
   unixassert( pthread_cond_signal( &write_activity ) );
 
+  if ( enqueue_callback ) {
+    (*enqueue_callback)(obj);
+  }
+
   return op;
 }
 
@@ -118,6 +135,10 @@ QueueElement<T> *Queue<T>::leapfrog_enqueue( T *h,
 
   unixassert( pthread_cond_signal( &write_activity ) );
 
+  if ( enqueue_callback ) {
+    (*enqueue_callback)(obj);
+  }
+
   return op;
 }
 
@@ -273,3 +294,5 @@ void Queue<T>::hookup( Queue<T> *s_output )
   head = tail = NULL;
   count = 0;
 }
+
+#endif

decoderop.cpp

@@ -31,9 +31,14 @@ class Queue
 
   Queue<T> *output;
 
+  void (*enqueue_callback)(void *obj);
+  void *obj;
+
 public:
   Queue( int s_max_size );
+  Queue() { Queue( 0 ); }
   ~Queue();
+
   QueueElement<T> *enqueue( T *h );
   QueueElement<T> *leapfrog_enqueue( T *h, T *leapfrog_type );
   void remove_specific( QueueElement<T> *op );
@@ -46,6 +51,9 @@ class Queue
   int get_count( void ) { MutexLock x( &mutex ); return count; }
 
   void hookup( Queue<T> *s_output );
+
+  void set_enqueue_callback( void (*s_enqueue_callback)(void *obj),
+			     void *s_obj );
 };
 
 #endif

decoderopq.cpp

@@ -0,0 +1,13 @@
+#include "decoderjob.hpp"
+#include "decoderop.hpp"
+#include "displayop.hpp"
+#include "framebuffer.hpp"
+#include "decodeengine.hpp"
+#include "controllerop.hpp"
+
+template class Queue<DecoderJob>;
+template class Queue<DecoderOperation>;
+template class Queue<DisplayOperation>;
+template class Queue<Frame>;
+template class Queue<ReadyThread>;
+template class Queue<ControllerOperation>;