[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] CVS: xine-lib/src/xine-engine xine_internal.h, 1.174,
From:       Miguel Freitas <miguelfreitas () users ! sourceforge ! net>
Date:       2006-08-13 23:51:36
Message-ID: E1GCPk0-0003qS-AY () sc8-pr-cvs10 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/xine/xine-lib/src/xine-engine
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14654/xine-lib/src/xine-engine

Modified Files:
	xine_internal.h xine.c demux.c xine_interface.c 
Log Message:
move image presentation support to xine-lib


Index: xine_internal.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/xine_internal.h,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- xine_internal.h	12 Aug 2006 01:43:26 -0000	1.174
+++ xine_internal.h	13 Aug 2006 23:51:33 -0000	1.175
@@ -343,6 +343,7 @@
                                                * layers as they cannot call \
xine_stop. */  int                        early_finish_event; /* do not wait fifos \
get empty before sending event */  int                        gapless_switch;     /* \
next stream switch will be gapless */ +  int                        \
delay_finish_event; /* delay event in 1/10 sec units. 0=>no delay, -1=>forever */  \
#endif  };
 

Index: xine.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/xine.c,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- xine.c	8 Aug 2006 03:25:03 -0000	1.325
+++ xine.c	13 Aug 2006 23:51:34 -0000	1.326
@@ -500,6 +500,7 @@
   stream->spu_channel_user       = -1;
   stream->spu_channel            = -1;
   stream->early_finish_event     = 0;
+  stream->delay_finish_event     = 0;
   stream->gapless_switch         = 0;
 
   stream->video_out              = vo;
@@ -1226,6 +1227,8 @@
 
   pthread_mutex_lock (&stream->frontend_lock);
 
+  stream->delay_finish_event = 0;
+  
   ret = play_internal (stream, start_pos, start_time);
   if( stream->slave && (stream->slave_affection & XINE_MASTER_SLAVE_PLAY) )
     xine_play (stream->slave, start_pos, start_time);

Index: demux.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/demux.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- demux.c	8 Aug 2006 03:25:03 -0000	1.63
+++ demux.c	13 Aug 2006 23:51:34 -0000	1.64
@@ -313,6 +313,17 @@
       status = stream->demux_plugin->get_status(stream->demux_plugin);
     }
 
+    /* delay sending finished event - used for image presentations */
+    while(stream->demux_thread_running &&
+          status == DEMUX_FINISHED && stream->delay_finish_event != 0){
+      pthread_mutex_unlock( &stream->demux_lock );
+      xine_usec_sleep(100000);
+      if( stream->delay_finish_event > 0 )
+        stream->delay_finish_event--;
+      pthread_mutex_lock( &stream->demux_lock );
+      status = stream->demux_plugin->get_status(stream->demux_plugin);
+    }
+
   } while( status == DEMUX_OK && stream->demux_thread_running &&
            !stream->emergency_brake);
 

Index: xine_interface.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/xine_interface.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- xine_interface.c	22 Jun 2006 10:38:38 -0000	1.96
+++ xine_interface.c	13 Aug 2006 23:51:34 -0000	1.97
@@ -485,6 +485,10 @@
     stream->early_finish_event = value;
     break;
   
+  case XINE_PARAM_DELAY_FINISHED_EVENT:
+    stream->delay_finish_event = value;
+    break;
+  
   case XINE_PARAM_GAPLESS_SWITCH:
     stream->gapless_switch = value;
     break;
@@ -642,6 +646,10 @@
     ret = stream->early_finish_event;
     break;
   
+  case XINE_PARAM_DELAY_FINISHED_EVENT:
+    ret = stream->delay_finish_event;
+    break;
+  
   case XINE_PARAM_GAPLESS_SWITCH:
     ret = stream->gapless_switch;
     break;


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog


[prev in list] [next in list] [prev in thread] [next in thread]