From c2bcb9f1991657926a99cd788e0215f663b87af3 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sun, 1 Feb 2009 01:39:52 +0100
Subject: [PATCH] WIP remove all locking and thread handling from
 PlaybackController.

Yay! as expected, just by refactoring orthogonally, the controller
gets much simpler, without adding much complexities to ProcessImpl
---
 src/gui/controller/playback-controller.cpp | 74 +++-------------------
 src/gui/controller/playback-controller.hpp | 21 +-----
 2 files changed, 11 insertions(+), 84 deletions(-)

diff --git a/src/gui/controller/playback-controller.cpp b/src/gui/controller/playback-controller.cpp
index 0ec7c6fe6..27832ec32 100644
--- a/src/gui/controller/playback-controller.cpp
+++ b/src/gui/controller/playback-controller.cpp
@@ -28,34 +28,22 @@ namespace gui {
 namespace controller { 
 
 PlaybackController::PlaybackController() :
-  thread(0),
-  finish_playback_thread(false),
   playing(false)
 { }
 
 
-PlaybackController::~PlaybackController()
-{
-  end_playback_thread();
-}
-
 void
 PlaybackController::play()
 {
-  if (playing && thread && playHandle)
+  if (playHandle)
     {
       playHandle.play(true);
-      return;
+      playing = true;
     }
-  if (thread)
-    end_playback_thread();
-  
-  {
-    Lock sync(this);
+  else
     try
       {
         playHandle =  proc::play::DummyPlayer::facade().start();
-        start_playback_thread();
         playing = true;
       }
     catch (lumiera::error::State& err)
@@ -64,59 +52,31 @@ PlaybackController::play()
         lumiera_error();
         playing = false;
       }
-  }
 }
 
 void
 PlaybackController::pause()
 {
-  Lock sync(this);
-  playing = false;
   if (playHandle)
     playHandle.play(false);
+  playing = false;
 }
 
 void
 PlaybackController::stop()
 {
-  {
-    Lock sync(this);
-    playing = false;
-    playHandle.close();
-    // TODO: stop player somehow?
-  }
-  end_playback_thread();
+  playHandle.close();
+  playing = false;
 }
 
 bool
 PlaybackController::is_playing()
 {
-  Lock sync(this);
   return playing;
 }
 
-void
-PlaybackController::start_playback_thread()
-{
-  dispatcher.connect(sigc::mem_fun(this, &PlaybackController::on_frame));
-  finish_playback_thread = false;
-  thread = Glib::Thread::create (sigc::mem_fun(
-    this, &PlaybackController::playback_thread), true);
-}
+//dispatcher.connect(sigc::mem_fun(this, &PlaybackController::on_frame));
 
-void
-PlaybackController::end_playback_thread()
-{
-  {
-    Lock sync(this);
-    finish_playback_thread = true;
-    playing = false;
-  }
-  if (thread)
-    thread->join();
-  thread = 0;
-  finish_playback_thread = false;
-}
 
 void
 PlaybackController::attach_viewer(
@@ -125,25 +85,8 @@ PlaybackController::attach_viewer(
   frame_signal.connect(on_frame);
 }
 
-void
-PlaybackController::playback_thread()
-{  
-  for(;;)
-    {
-      {
-        Lock sync(this);
-        if(finish_playback_thread)
-          return;
-      }
-      
-      if(is_playing())
-        pull_frame();
-      
-      usleep(40000); // ca 25 frames pre second
-    }
-}
-
 
+/*
 void
 PlaybackController::pull_frame()
 {
@@ -162,6 +105,7 @@ PlaybackController::pull_frame()
       TRACE (render, "frame dropped?");
     }
 }
+*/
 
 
 void
diff --git a/src/gui/controller/playback-controller.hpp b/src/gui/controller/playback-controller.hpp
index b05ae0c6f..abe1340c5 100644
--- a/src/gui/controller/playback-controller.hpp
+++ b/src/gui/controller/playback-controller.hpp
@@ -27,7 +27,6 @@
 #define PLAYBACK_CONTROLLER_HPP
 
 #include "include/dummy-player-facade.h"
-#include "lib/sync.hpp"
 
 #include <sigc++/sigc++.h>
 #include <glibmm.h>
@@ -36,19 +35,14 @@
 namespace gui {
 namespace controller {
 
-using lib::Sync;
-using lib::RecursiveLock_NoWait;
 
 
 class PlaybackController
   : boost::noncopyable,
-    public Sync<RecursiveLock_NoWait>
 {
 public:
 
   PlaybackController();
-  
-  ~PlaybackController();
 
   void play();
   
@@ -61,27 +55,16 @@ public:
   void attach_viewer(const sigc::slot<void, void*>& on_frame);
   
 private:
-
-  void start_playback_thread();
-
-  void end_playback_thread();
-  
-  void playback_thread();
-
-  void pull_frame();
   
   void on_frame();
   
+  
 private:
 
-  Glib::Thread *thread;
+  volatile bool playing;
   
   Glib::Dispatcher dispatcher;
   
-  volatile bool finish_playback_thread;
-  
-  volatile bool playing;
-  
   proc::play::DummyPlayer::Process playHandle;
   
   unsigned char * currentBuffer;