Revision: 7085
http://playerstage.svn.sourceforge.net/playerstage/?rev=7085&view=rev
Author: thjc
Date: 2008-10-07 11:42:58 +0000 (Tue, 07 Oct 2008)
Log Message:
-----------
applie patch 2147841 Player 2.2 and 2.1: revert of Update() method
Modified Paths:
--------------
code/player/branches/release-2-1-patches/libplayertcp/playertcp.h
code/player/branches/release-2-1-patches/libplayertcp/remote_driver.cc
code/player/branches/release-2-1-patches/libplayertcp/remote_driver.h
Modified: code/player/branches/release-2-1-patches/libplayertcp/playertcp.h
===================================================================
--- code/player/branches/release-2-1-patches/libplayertcp/playertcp.h
2008-10-07 11:42:30 UTC (rev 7084)
+++ code/player/branches/release-2-1-patches/libplayertcp/playertcp.h
2008-10-07 11:42:58 UTC (rev 7085)
@@ -136,13 +136,12 @@
/** Total size of @p decode_readbuffer */
int decode_readbuffersize;
- void Lock();
- void Unlock();
-
public:
PlayerTCP();
~PlayerTCP();
+ void Lock();
+ void Unlock();
static void InitGlobals(void);
Modified: code/player/branches/release-2-1-patches/libplayertcp/remote_driver.cc
===================================================================
--- code/player/branches/release-2-1-patches/libplayertcp/remote_driver.cc
2008-10-07 11:42:30 UTC (rev 7084)
+++ code/player/branches/release-2-1-patches/libplayertcp/remote_driver.cc
2008-10-07 11:42:58 UTC (rev 7085)
@@ -365,6 +365,21 @@
return(0);
}
+void
+TCPRemoteDriver::Update()
+{
+ if(this->ptcp->thread == pthread_self())
+ {
+ //this->ptcp->Read(0,true);
+ this->ptcp->Lock();
+ this->ptcp->ReadClient(this->queue);
+ this->ptcp->Unlock();
+ }
+ this->ProcessMessages();
+ if(this->ptcp->thread == pthread_self())
+ this->ptcp->Write(false);
+}
+
int
TCPRemoteDriver::ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr,
Modified: code/player/branches/release-2-1-patches/libplayertcp/remote_driver.h
===================================================================
--- code/player/branches/release-2-1-patches/libplayertcp/remote_driver.h
2008-10-07 11:42:30 UTC (rev 7084)
+++ code/player/branches/release-2-1-patches/libplayertcp/remote_driver.h
2008-10-07 11:42:58 UTC (rev 7085)
@@ -63,6 +63,7 @@
virtual int Setup();
virtual int Shutdown();
+ virtual void Update();
virtual int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
