[xine-cvs] CVS: xine-ui/src/xitk actions.c,1.153,1.154 main.c,1.191,1.192

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory sc8-pr-cvs1:/tmp/cvs-serv10949

Modified Files:
	actions.c main.c 
Log Message:
add auto start (in newbie mode) and command line playlist

Index: actions.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/actions.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- actions.c	7 Jan 2003 21:27:29 -0000	1.153
+++ actions.c	8 Jan 2003 22:20:14 -0000	1.154
@@ -82,11 +82,8 @@
 
 int gui_xine_play(xine_stream_t *stream, int start_pos, int start_time_in_secs, int update_mmk) {
   int      ret;
-  int      has_video;
-#if 0
-  in        has_audio;
+  int      has_video, has_audio;
   uint32_t video_handled, audio_handled;
-#endif
   
   if(gGui->visual_anim.post_changed && (xine_get_status(stream) == XINE_STATUS_STOP)) {
     post_rewire_visual_anim();
@@ -97,7 +94,7 @@
     start_time_in_secs *= 1000;
       
   has_video     = xine_get_stream_info(stream, XINE_STREAM_INFO_HAS_VIDEO);
-#if 0
+#if 0 /* Will be enabled sooner */
   video_handled = xine_get_stream_info(stream, XINE_STREAM_INFO_VIDEO_HANDLED);
   audio_handled = xine_get_stream_info(stream, XINE_STREAM_INFO_AUDIO_HANDLED);
   has_audio     = xine_get_stream_info(stream, XINE_STREAM_INFO_HAS_AUDIO);
@@ -122,7 +119,6 @@
     }
 
     xine_error(buffer);
-    abort();
     return 0;
   }
 #endif

Index: main.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/main.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- main.c	5 Jan 2003 00:24:34 -0000	1.191
+++ main.c	8 Jan 2003 22:20:17 -0000	1.192
@@ -1155,7 +1155,8 @@
   gui_init(_argc - optind, &_argv[optind], &window_attribute);
   
   /* Automatically start playback if new_mode is enabled and playlist is filled */
-  if(gGui->newbie_mode && gGui->playlist.num &&
+  if(gGui->newbie_mode && 
+     (gGui->playlist.num || actions_on_start(gGui->actions_on_start, ACTID_PLAYLIST)) &&
      (!(actions_on_start(gGui->actions_on_start, ACTID_PLAY))))
     gGui->actions_on_start[aos++] = ACTID_PLAY;