Browse files

[dvdplayer] replace DWORD by unsigned in for sync object handling

  • Loading branch information...
1 parent 8996c05 commit 9e21a34550777a2fc5fc55f7549ed4184c893577 @elupus committed Jul 2, 2012
View
8 xbmc/cores/dvdplayer/DVDMessage.cpp
@@ -33,7 +33,7 @@
class CDVDMsgGeneralSynchronizePriv
{
public:
- CDVDMsgGeneralSynchronizePriv(DWORD timeout, DWORD sources)
+ CDVDMsgGeneralSynchronizePriv(unsigned int timeout, unsigned int sources)
: timeout(timeout)
, sources(sources ? sources : SYNCSOURCE_ALL)
, reached(0)
@@ -48,7 +48,7 @@ class CDVDMsgGeneralSynchronizePriv
/**
* CDVDMsgGeneralSynchronize --- GENERAL_SYNCRONIZR
*/
-CDVDMsgGeneralSynchronize::CDVDMsgGeneralSynchronize(DWORD timeout, DWORD sources) : CDVDMsg(GENERAL_SYNCHRONIZE)
+CDVDMsgGeneralSynchronize::CDVDMsgGeneralSynchronize(unsigned int timeout, unsigned int sources) : CDVDMsg(GENERAL_SYNCHRONIZE)
, m_p(new CDVDMsgGeneralSynchronizePriv(timeout, sources))
{
}
@@ -58,7 +58,7 @@ CDVDMsgGeneralSynchronize::~CDVDMsgGeneralSynchronize()
delete m_p;
}
-bool CDVDMsgGeneralSynchronize::Wait(unsigned long milliseconds, DWORD source)
+bool CDVDMsgGeneralSynchronize::Wait(unsigned long milliseconds, unsigned int source)
{
if(source == 0)
source = SYNCSOURCE_OWNER;
@@ -86,7 +86,7 @@ bool CDVDMsgGeneralSynchronize::Wait(unsigned long milliseconds, DWORD source)
return true;
}
-void CDVDMsgGeneralSynchronize::Wait(volatile bool *abort, DWORD source)
+void CDVDMsgGeneralSynchronize::Wait(volatile bool *abort, unsigned int source)
{
while(!Wait(100, source))
{
View
6 xbmc/cores/dvdplayer/DVDMessage.h
@@ -154,14 +154,14 @@ class CDVDMsgGeneralSynchronizePriv;
class CDVDMsgGeneralSynchronize : public CDVDMsg
{
public:
- CDVDMsgGeneralSynchronize(DWORD timeout, DWORD sources);
+ CDVDMsgGeneralSynchronize(unsigned int timeout, unsigned int sources);
~CDVDMsgGeneralSynchronize();
virtual long Release();
// waits until all threads waiting, released the object
// if abort is set somehow
- bool Wait(unsigned long ms , DWORD source);
- void Wait(volatile bool *abort, DWORD source);
+ bool Wait(unsigned long ms , unsigned int source);
+ void Wait(volatile bool *abort, unsigned int source);
private:
class CDVDMsgGeneralSynchronizePriv* m_p;
};
View
4 xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -1743,7 +1743,7 @@ void CDVDPlayer::CheckAutoSceneSkip()
}
-void CDVDPlayer::SynchronizeDemuxer(DWORD timeout)
+void CDVDPlayer::SynchronizeDemuxer(unsigned int timeout)
{
if(IsCurrentThread())
return;
@@ -1756,7 +1756,7 @@ void CDVDPlayer::SynchronizeDemuxer(DWORD timeout)
message->Release();
}
-void CDVDPlayer::SynchronizePlayers(DWORD sources)
+void CDVDPlayer::SynchronizePlayers(unsigned int sources)
{
/* we need a big timeout as audio queue is about 8seconds for 2ch ac3 */
const int timeout = 10*1000; // in milliseconds
View
4 xbmc/cores/dvdplayer/DVDPlayer.h
@@ -301,8 +301,8 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer
void HandlePlaySpeed();
bool IsInMenu() const;
- void SynchronizePlayers(DWORD sources);
- void SynchronizeDemuxer(DWORD timeout);
+ void SynchronizePlayers(unsigned int sources);
+ void SynchronizeDemuxer(unsigned int timeout);
void CheckAutoSceneSkip();
void CheckContinuity(CCurrentStream& current, DemuxPacket* pPacket);
bool CheckSceneSkip(CCurrentStream& current);

0 comments on commit 9e21a34

Please sign in to comment.