commit b4f969b268046f0952bfc500dc9e9b1258cb00d8
author george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> Wed Feb 09 16:34:51 2005 +0000
committer george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> Wed Feb 09 16:34:51 2005 +0000
tree 4da6dba94d5a87b59b662e9014bdacd549b94466
parent ea913c10b99815b2b39d86ab34c4c30327c3a944

Improved RfbPlayer implementation.
The reading thread must resume playback itself when destoying.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@161 3789f03b-4d11-0410-bbf8-ca57d06f2519

rfbplayer/rfbSessionReader.h

diff --git a/rfbplayer/rfbSessionReader.h b/rfbplayer/rfbSessionReader.h
index f42a9ee..acf9188 100644
--- a/rfbplayer/rfbSessionReader.h
+++ b/rfbplayer/rfbSessionReader.h
@@ -35,6 +35,7 @@
   }
 
   virtual Thread* join() {
+    ((FbsInputStream*)(rfbSession->getInStream()))->resumePlayback();
     fStop = true;
     return Thread::join();
   }

rfbplayer/rfbplayer.cxx

diff --git a/rfbplayer/rfbplayer.cxx b/rfbplayer/rfbplayer.cxx
index 60c1c3b..ad0607f 100644
--- a/rfbplayer/rfbplayer.cxx
+++ b/rfbplayer/rfbplayer.cxx
@@ -93,9 +93,6 @@
     SetWindowLong(hwnd, GWL_USERDATA, (long)((CREATESTRUCT*)lParam)->lpCreateParams);
   else if (msg == WM_DESTROY) {
     RfbPlayer* _this = (RfbPlayer*) GetWindowLong(hwnd, GWL_USERDATA);
-
-    // Resume playback (It's need to quit from FbsInputStream::waitWhilePaused())
-    _this->setPaused(false);
     SetWindowLong(hwnd, GWL_USERDATA, 0);
   }
   RfbPlayer* _this = (RfbPlayer*) GetWindowLong(hwnd, GWL_USERDATA);
@@ -362,7 +359,6 @@
       }
       break;
     case ID_EXIT:
-      if (is) is->resumePlayback();
       PostQuitMessage(0);
       break;
     case ID_HELP_COMMANDLINESWITCHES:
@@ -906,8 +902,8 @@
 
   // Close the previous reading thread
   if (rfbReader) {
-    is->resumePlayback();
     delete rfbReader->join();
+    rfbReader = 0;
   }
   blankBuffer();
   newSession(fileName);