Revision: 7221 http://playerstage.svn.sourceforge.net/playerstage/?rev=7221&view=rev Author: thjc Date: 2009-01-02 20:42:04 +0000 (Fri, 02 Jan 2009)
Log Message: ----------- Updated some drivers that were missed in the first pass to the threaded driver API Modified Paths: -------------- code/player/trunk/server/drivers/camera/compress/cameracompress.cc code/player/trunk/server/drivers/camera/compress/camerauncompress.cc code/player/trunk/server/drivers/camera/v4l/camerav4l.cc Modified: code/player/trunk/server/drivers/camera/compress/cameracompress.cc =================================================================== --- code/player/trunk/server/drivers/camera/compress/cameracompress.cc 2008-12-28 07:33:34 UTC (rev 7220) +++ code/player/trunk/server/drivers/camera/compress/cameracompress.cc 2009-01-02 20:42:04 UTC (rev 7221) @@ -92,7 +92,7 @@ // Setup/shutdown routines. public: virtual int MainSetup(); - public: virtual int Shutdown(); + public: virtual void MainQuit(); // This method will be invoked on each incoming message public: virtual int ProcessMessage(QueuePointer & resp_queue, @@ -179,11 +179,8 @@ return 0; } -int CameraCompress::Shutdown() +void CameraCompress::MainQuit() { - // Stop the driver thread - StopThread(); - camera->Unsubscribe(InQueue); if (this->data.image) @@ -191,8 +188,6 @@ delete []this->data.image; this->data.image = NULL; } - - return 0; } //////////////////////////////////////////////////////////////////////////////// Modified: code/player/trunk/server/drivers/camera/compress/camerauncompress.cc =================================================================== --- code/player/trunk/server/drivers/camera/compress/camerauncompress.cc 2008-12-28 07:33:34 UTC (rev 7220) +++ code/player/trunk/server/drivers/camera/compress/camerauncompress.cc 2009-01-02 20:42:04 UTC (rev 7221) @@ -93,7 +93,7 @@ // Setup/shutdown routines. public: virtual int MainSetup(); - public: virtual int Shutdown(); + public: virtual void MainQuit(); // This method will be invoked on each incoming message public: virtual int ProcessMessage(QueuePointer &resp_queue, @@ -179,14 +179,9 @@ return 0; } -int CameraUncompress::Shutdown() +void CameraUncompress::MainQuit() { - // Stop the driver thread - StopThread(); - camera->Unsubscribe(InQueue); - - return 0; } //////////////////////////////////////////////////////////////////////////////// Modified: code/player/trunk/server/drivers/camera/v4l/camerav4l.cc =================================================================== --- code/player/trunk/server/drivers/camera/v4l/camerav4l.cc 2008-12-28 07:33:34 UTC (rev 7220) +++ code/player/trunk/server/drivers/camera/v4l/camerav4l.cc 2009-01-02 20:42:04 UTC (rev 7221) @@ -196,7 +196,7 @@ // Setup/shutdown routines. public: virtual int MainSetup(); - public: virtual int Shutdown(); + public: virtual void MainQuit(); // This method will be invoked on each incoming message public: virtual int ProcessMessage(QueuePointer & resp_queue, @@ -439,18 +439,14 @@ //////////////////////////////////////////////////////////////////////////////// // Shutdown the device (called by server thread). -int CameraV4L::Shutdown() +void CameraV4L::MainQuit() { - // Stop the driver thread. - StopThread(); - // Free resources frame_release(this->frame); if ((this->frame->format == VIDEO_PALETTE_YUV420P)&& (this->format == PLAYER_CAMERA_FORMAT_RGB888)) frame_release(this->rgb_converted_frame); fg_close(this->fg); - return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ _______________________________________________ Playerstage-commit mailing list Playerstage-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/playerstage-commit