summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--device.c8
-rw-r--r--device.h4
2 files changed, 6 insertions, 6 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;
}
diff --git a/device.h b/device.h
index 3cd9cb3e..10ef790c 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: device.h,v 1.36 2008-09-18 13:47:10 phintuka Exp $
+ * $Id: device.h,v 1.37 2008-11-18 15:14:40 phintuka Exp $
*
*/
@@ -239,7 +239,7 @@ class cXinelibDevice : public cDevice
public:
bool PlayFile(const char *Filename, int Position=0,
bool LoopPlay=false, ePlayMode PlayMode=pmAudioVideo);
- int PlayFileCtrl(const char *Cmd);
+ int PlayFileCtrl(const char *Cmd, int TimeoutMs=-1);
bool EndOfStreamReached(void);