diff options
author | phintuka <phintuka> | 2009-01-26 09:02:08 +0000 |
---|---|---|
committer | phintuka <phintuka> | 2009-01-26 09:02:08 +0000 |
commit | 976555e242ac254ef17f98bdbd7f0356e22b7646 (patch) | |
tree | dd27f53b7be7cb34fc1f249a5ce3957786ef562f /device.c | |
parent | 3f4abcf65877dbaf9b75d896afd29b568c0dc5ba (diff) | |
download | xineliboutput-976555e242ac254ef17f98bdbd7f0356e22b7646.tar.gz xineliboutput-976555e242ac254ef17f98bdbd7f0356e22b7646.tar.bz2 |
Added TimeoutMs to PlayFile()
Diffstat (limited to 'device.c')
-rw-r--r-- | device.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: device.c,v 1.64 2009-01-08 11:58:33 rofafor Exp $ + * $Id: device.c,v 1.65 2009-01-26 09:02:08 phintuka Exp $ * */ @@ -872,7 +872,8 @@ bool cXinelibDevice::EndOfStreamReached(void) } bool cXinelibDevice::PlayFile(const char *FileName, int Position, - bool LoopPlay, ePlayMode PlayMode) + bool LoopPlay, ePlayMode PlayMode, + int TimeoutMs) { TRACEF("cXinelibDevice::PlayFile"); TRACE("cXinelibDevice::PlayFile(\"" << FileName << "\")"); @@ -888,14 +889,14 @@ bool cXinelibDevice::PlayFile(const char *FileName, int Position, for(int i = 0; i < mi_Count; i++) m_MetaInfo[i][0] = 0; if(m_server) - result = m_server->PlayFile(FileName, Position, LoopPlay, PlayMode); + result = m_server->PlayFile(FileName, Position, LoopPlay, PlayMode, TimeoutMs); if(m_local) - result = m_local->PlayFile(FileName, Position, LoopPlay, PlayMode); + result = m_local->PlayFile(FileName, Position, LoopPlay, PlayMode, TimeoutMs); } else if(/*!FileName &&*/m_PlayingFile != pmNone) { if(m_server) - result = m_server->PlayFile(NULL, 0); + result = m_server->PlayFile(NULL, 0, 0, pmNone, TimeoutMs); if(m_local) - result = m_local->PlayFile(NULL, 0); + result = m_local->PlayFile(NULL, 0, 0, pmNone, TimeoutMs); if(!m_liveMode) SetReplayMode(); else |