summaryrefslogtreecommitdiff
path: root/device.c
diff options
context:
space:
mode:
authorphintuka <phintuka>2008-11-18 15:14:40 +0000
committerphintuka <phintuka>2008-11-18 15:14:40 +0000
commit987c942467ce5a0884de0d111bcc7852dd81493a (patch)
tree1bf4307323545ffee4f3fd152c3020eb43b850e6 /device.c
parent32f05f041fd902b64522bbf5c691dc6536cb90e0 (diff)
downloadxineliboutput-987c942467ce5a0884de0d111bcc7852dd81493a.tar.gz
xineliboutput-987c942467ce5a0884de0d111bcc7852dd81493a.tar.bz2
Added optional timeout to PlayFileCtrl
Diffstat (limited to 'device.c')
-rw-r--r--device.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/device.c b/device.c
index 4510dbf9..f9b9c900 100644
--- a/device.c
+++ b/device.c
@@ -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.60 2008-06-11 23:21:49 phintuka Exp $
+ * $Id: device.c,v 1.61 2008-11-18 15:14:40 phintuka Exp $
*
*/
@@ -867,16 +867,16 @@ bool cXinelibDevice::Flush(int TimeoutMs)
// Playback of files and images
//
-int cXinelibDevice::PlayFileCtrl(const char *Cmd)
+int cXinelibDevice::PlayFileCtrl(const char *Cmd, int TimeoutMs)
{
TRACEF("cXinelibDevice::PlayFile");
int result = -1;
if(m_PlayingFile != pmNone) {
if(m_server)
- result = m_server->PlayFileCtrl(Cmd);
+ result = m_server->PlayFileCtrl(Cmd, TimeoutMs);
if(m_local)
- result = m_local->PlayFileCtrl(Cmd);
+ result = m_local->PlayFileCtrl(Cmd, TimeoutMs);
}
return result;
}