summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2007-01-06 04:31:21 +0000
committerphintuka <phintuka>2007-01-06 04:31:21 +0000
commit13f4c35bde179aa81a5bcdf870001d6328fe8610 (patch)
tree7cc3ef7643596334536c1e17e2b49812bb82898b
parentf3007128f9a0da8bcc802928ba36b4d294d996e2 (diff)
downloadxineliboutput-13f4c35bde179aa81a5bcdf870001d6328fe8610.tar.gz
xineliboutput-13f4c35bde179aa81a5bcdf870001d6328fe8610.tar.bz2
Start in live mode
-rw-r--r--frontend.c6
-rw-r--r--frontend_local.c10
2 files changed, 8 insertions, 8 deletions
diff --git a/frontend.c b/frontend.c
index f0745746..c827ade0 100644
--- a/frontend.c
+++ b/frontend.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: frontend.c,v 1.26 2007-01-01 08:37:47 phintuka Exp $
+ * $Id: frontend.c,v 1.27 2007-01-06 04:31:21 phintuka Exp $
*
*/
@@ -180,7 +180,7 @@ cXinelibThread::cXinelibThread(const char *Description) : cThread(Description)
m_bReady = false;
m_bIsFinished = false;
m_bNoVideo = true;
- m_bLiveMode = false;
+ m_bLiveMode = true; /* can't be replaying when there is no output device */
m_StreamPos = 0;
m_Frames = 0;
m_bEndOfStreamReached = false;
@@ -276,14 +276,12 @@ void cXinelibThread::SetLiveMode(bool LiveModeOn)
Unlock();
Xine_Control("LIVE", m_bLiveMode ? 1 : 0);
- Xine_Sync();
}
void cXinelibThread::SetStillMode(bool StillModeOn)
{
TRACEF("cXinelibThread::SetStillMode");
Xine_Control("STILL", StillModeOn ? 1 : 0);
- Xine_Sync();
}
void cXinelibThread::SetNoVideo(bool bVal)
diff --git a/frontend_local.c b/frontend_local.c
index 0348da47..7d00fc0c 100644
--- a/frontend_local.c
+++ b/frontend_local.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: frontend_local.c,v 1.14 2006-12-19 16:34:31 phintuka Exp $
+ * $Id: frontend_local.c,v 1.15 2007-01-06 04:29:00 phintuka Exp $
*
*/
@@ -358,7 +358,8 @@ void cXinelibLocal::Action(void)
if(!curr_fe->fe_display_open(curr_fe, xc.width, xc.height, xc.fullscreen,
xc.modeswitch, xc.modeline,
xc.display_aspect, keypress_handler,
- xc.video_port, xc.scale_video,
+ xc.video_port,
+ xc.scale_video,
xc.field_order)) {
LOGMSG("cXinelibLocal: Error initializing display");
SetStopSignal();
@@ -433,9 +434,10 @@ void cXinelibLocal::Action(void)
{
LOCK_THREAD;
Xine_Control("NOVIDEO 0");
- Xine_Control("LIVE 0");
+ Xine_Control("LIVE 1");
+ Xine_Control("CLEAR");
m_bNoVideo = false;
- m_bLiveMode = false;
+ m_bLiveMode = true;
m_bReady = true;
}