Changeset 39a7f7e696685c58885539226344c9c93e24fce5

Timestamp:

05/12/03 05:24:47 (5 years ago)

Author:

Rocky Bernstein <rocky@videolan.org>

git-committer:

Rocky Bernstein <rocky@videolan.org> 1070598287 +0000

git-parent:

[3e50586459c47fc257f0aef7abc1f10994bfa9a5]

git-author:

Rocky Bernstein <rocky@videolan.org> 1070598287 +0000

Message:

Slightly better handling of stills and toggling pause by using the
different threads better.

Still has stream still/to MPEG bug and duplicate video window bug though.
(And could use lots of cleanup.)

Files:

• modules/access/vcdx/Modules.am (modified) (2 diffs)
• modules/access/vcdx/access.c (modified) (12 diffs)
• modules/access/vcdx/demux.c (modified) (2 diffs)
• modules/access/vcdx/intf.c (modified) (11 diffs)
• modules/access/vcdx/intf.h (modified) (2 diffs)
• modules/access/vcdx/vcdplayer.c (modified) (4 diffs)

modules/access/vcdx/Modules.am

@@ -1 +1 @@
-SOURCES_vcdx = \
+    access.c \
+    cdrom.c \
+    cdrom.h \
+    demux.c \
-    intf.c \
-    intf.h \
@@ -6 +10 @@
-    vcdplayer.h \
-    vcdplayer.c \
-    cdrom.c \
-    cdrom.h \
-    demux.c \
-    access.c \
-    $(NULL)

modules/access/vcdx/access.c

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 2000,2003 VideoLAN
-7 2003/12/03 21:55:33
+8 2003/12/05 04:24:47
- *
- * Authors: Rocky Bernstein <rocky@panix.com> 
@@ -31 +31 @@
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-_interface
+/intf
-
-#include "../../demux/mpeg/system.h"
-#include "vcd.h"
+#include "vcdplayer.h"
-#include "intf.h"
-#include "vcdplayer.h"
-
-#include <cdio/cdio.h>
@@ -50 +50 @@
-#define VCD_BLOCKS_ONCE 20
-#define VCD_DATA_ONCE   (VCD_BLOCKS_ONCE * M2F2_SECTOR_SIZE)
+
+#define VCD_MRL_PREFIX "vcdx://"
-
-/*****************************************************************************
@@ -194 +196 @@
-            p_buf += 2;
-            *p_buf = 0x01;
-\n
-
-/* p_vcd->p_intf->b_end_of_cell = true; */
+
+
+p_vcd->p_intf->p_sys->b_still = 1;
-        input_SetStatus( p_input, INPUT_STATUS_PAUSE );
-
@@ -206 +208 @@
-        vlc_mutex_unlock( &p_input->stream.stream_lock );
-
+            dbg_print(INPUT_DBG_STILL, "Clock manage");
-        input_ClockManageControl( p_input, p_pgrm, 0 );
+            dbg_print(INPUT_DBG_STILL, "Clock manage done");
-
-            return i_read + M2F2_SECTOR_SIZE;
@@ -946 +950 @@
-#define meta_info_add_str(title, str) \
-  if ( str ) {                              \
-
+   
-    input_AddInfo( p_cat, _(title), "%s", str );            \
-  }
@@ -978 +982 @@
-}
-
+#if FINISHED_PLAYLIST
+static void
+VCDCreatePlayListItem(const input_thread_t *p_input, 
+              thread_vcd_data_t *p_vcd, 
+              playlist_t *p_playlist, unsigned int i_track, 
+              char *psz_mrl, int psz_mrl_max, 
+              const char *psz_source, int playlist_operation, 
+              unsigned int i_pos)
+{
+  mtime_t i_duration = 
+    (vcdinfo_get_track_size(p_vcd->vcd, i_track) * 8 * 10000000)
+    / (400 * p_input->stream.control.i_rate) ;
+  char *p_title;
+  char *config_varname = MODULE_STRING "-title-format";
+
+  snprintf(psz_mrl, psz_mrl_max, "%s%s@T%u", 
+       VCD_MRL_PREFIX, psz_source, i_track);
+
+#if 0
+  p_title = VCDFormatStr(p_input, p_vcd, 
+             config_GetPsz( p_input, config_varname ), 
+             psz_mrl, i_track);
+#else
+  p_title = psz_mrl;
+#endif
+
+  playlist_AddExt( p_playlist, psz_mrl, p_title, i_duration, 
+           0, 0, playlist_operation, i_pos );
+}
+
+static int
+VCDFixupPlayList( input_thread_t *p_input, thread_vcd_data_t *p_vcd, 
+          const char *psz_source )
+{
+  unsigned int i;
+  playlist_t * p_playlist;
+  char       * psz_mrl;
+  unsigned int psz_mrl_max = strlen(VCD_MRL_PREFIX) + strlen(psz_source) + 
+    strlen("@T") + strlen("100") + 1;
+
+  psz_mrl = malloc( psz_mrl_max );
+
+  if( psz_mrl == NULL )
+    {
+      msg_Warn( p_input, "out of memory" );
+      return -1;
+    }
+
+  p_playlist = (playlist_t *) vlc_object_find( p_input, VLC_OBJECT_PLAYLIST,
+                           FIND_ANYWHERE );
+  if( !p_playlist )
+    {
+      msg_Warn( p_input, "can't find playlist" );
+      free(psz_mrl);
+      return -1;
+    }
+
+  if ( config_GetInt( p_input, MODULE_STRING "-PBC" ) ) {
+    /* May fill out more information when the playlist user interface becomes
+       more mature.
+     */
+    VCDCreatePlayListItem(p_input, p_vcd, p_playlist, p_vcd->cur_track, 
+              psz_mrl, psz_mrl_max, psz_source, PLAYLIST_REPLACE, 
+              p_playlist->i_index);
+  } else {
+  
+    playlist_Delete( p_playlist, p_playlist->i_index);
+
+    for( i = 1 ; i < p_vcd->num_tracks ; i++ )
+      {
+    VCDCreatePlayListItem(p_input, p_vcd, p_playlist, i, psz_mrl, 
+                  psz_mrl_max, psz_source, PLAYLIST_APPEND, 
+                  PLAYLIST_END);
+
+      }
+
+    playlist_Command( p_playlist, PLAYLIST_GOTO, 0 );
+
+  }
+    
+  vlc_object_release( p_playlist );
+  free(psz_mrl);
+  return 0;
+}
+#endif
+
-/*****************************************************************************
- * Public routines.
@@ -1062 +1152 @@
-    {
-        msg_Warn( p_input, "could not open %s", psz_source );
-
-
-
+
-    }
-
@@ -1071 +1159 @@
-                                            vcdinfo_get_cd_image(p_vcd->vcd), 
-                                            &p_vcd->p_sectors );
-    free( psz_source );
-    if( p_vcd->num_tracks < 0 )
-        LOG_ERR ("unable to count tracks" );
@@ -1079 +1166 @@
-    {
-        vcdinfo_close( p_vcd->vcd );
-
-
+
-    }
-
@@ -1118 +1204 @@
-    if ( ! b_play_ok ) {
-      vcdinfo_close( p_vcd->vcd );
-
-
+
-    }
-
@@ -1137 +1222 @@
-    InformationCreate( p_input );
-
+#if FINISHED_PLAYLIST
+    VCDFixupPlayList( p_input, p_vcd, psz_source );
+#endif
+    
+    free( psz_source );
+
-    return VLC_SUCCESS;
+ err_exit:
+    free( psz_source );
+    free( p_vcd );
+    return VLC_EGENERIC;
-}
-

modules/access/vcdx/demux.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-2 2003/11/09 00:52:32
+3 2003/12/05 04:24:47
- *
- * Author: St�ane Borel <stef@via.ecp.fr>
@@ -50 +50 @@
-
-#include "vcd.h"
+#include "vcdplayer.h"
-#include "intf.h"
-

modules/access/vcdx/intf.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002,2003 VideoLAN
-9 2003/11/26 01:45:03
+10 2003/12/05 04:24:47
- *
- * Authors: Rocky Bernstein <rocky@panix.com>
@@ -36 +36 @@
-#include "vcd.h"
-#include "vcdplayer.h"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-/*****************************************************************************
@@ -61 +42 @@
- *****************************************************************************/
-static int  InitThread     ( intf_thread_t *p_intf );
-static int  MouseEvent     ( vlc_object_t *, char const *,
-                             vlc_value_t, vlc_value_t, void * );
-static int  KeyEvent       ( vlc_object_t *, char const *,
-                             vlc_value_t, vlc_value_t, void * );
@@ -101 +80 @@
-{
-    intf_thread_t *p_intf = (intf_thread_t *)p_this;
+    var_DelCallback( p_intf->p_vlc, "key-pressed", KeyEvent, p_intf );
-
-    /* Destroy structure */
@@ -113 +93 @@
-{
-    vlc_object_t      * p_vout = NULL;
+    mtime_t             mtime = 0;
+    mtime_t             mlast = 0;
-    thread_vcd_data_t * p_vcd;
-    input_thread_t    * p_input;
@@ -136 +118 @@
-    {
-      vlc_mutex_lock( &p_intf->change_lock );
+
+        /*
+         * still images
+         */
+        if( p_intf->p_sys->b_still && !p_intf->p_sys->b_inf_still )
+        {
+            if( p_intf->p_sys->m_still_time > 0 )
+            {
+                /* update remaining still time */
+            dbg_print(INPUT_DBG_STILL, "updating still time");
+                mtime = mdate();
+                if( mlast )
+                {
+                    p_intf->p_sys->m_still_time -= mtime - mlast;
+                }
+
+                mlast = mtime;
+            }
+            else
+            {
+                /* still time elasped */
+            dbg_print(INPUT_DBG_STILL, "wait time done - setting play");
+                input_SetStatus( p_intf->p_sys->p_input,
+                                 INPUT_STATUS_PLAY );
+                p_intf->p_sys->m_still_time = 0;
+                p_intf->p_sys->b_still = 0;
+                mlast = 0;
+            }
+        }
-
-      /*
@@ -216 +227 @@
-        }
-        number_addend = 0;
+
+        /* we can safely interact with the VCD player
+         * with the stream lock */
+        if( p_intf->p_sys->b_still )
+          {
+        dbg_print(INPUT_DBG_STILL, "Playing still after activate");
+        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
+        p_intf->p_sys->b_still = 0;
+        p_intf->p_sys->b_inf_still = 0;
+        p_intf->p_sys->m_still_time = 0;
+          }
+
-      } else {
-        unsigned int digit_entered=0;
@@ -260 +283 @@
-      if( p_vout )
-            {
-          var_AddCallback( p_vout, "mouse-moved", MouseEvent, p_intf );
-          var_AddCallback( p_vout, "mouse-clicked", MouseEvent, p_intf );
-          var_AddCallback( p_vout, "key-pressed", KeyEvent, p_intf );
-            }
@@ -273 +294 @@
-    if( p_vout )
-    {
-        var_DelCallback( p_vout, "mouse-moved", MouseEvent, p_intf );
-        var_DelCallback( p_vout, "mouse-clicked", MouseEvent, p_intf );
-        var_DelCallback( p_vout, "key-pressed", KeyEvent, p_intf );
-        vlc_object_release( p_vout );
@@ -319 +338 @@
-
-/*****************************************************************************
- * MouseEvent: callback for mouse events
- *****************************************************************************/
-static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
-                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
-{
-    intf_thread_t *p_intf = (intf_thread_t *)p_data;
-
-    vlc_mutex_lock( &p_intf->change_lock );
-
-    if( psz_var[6] == 'c' ) /* "mouse-clicked" */
-    {
-        p_intf->p_sys->b_click = VLC_TRUE;
-    }
-    else if( psz_var[6] == 'm' ) /* "mouse-moved" */
-    {
-        p_intf->p_sys->b_move = VLC_TRUE;
-    }
-
-    vlc_mutex_unlock( &p_intf->change_lock );
-
-    return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * KeyEvent: callback for keyboard events
- *****************************************************************************/
@@ -359 +354 @@
-
-/*****************************************************************************
-dv
+vc
- * still images
- *****************************************************************************/

modules/access/vcdx/intf.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-1 2003/10/04 18:55:13 gbazin
+2 2003/12/05 04:24:47 rocky
- *
- * Author: St�ane Borel <stef@via.ecp.fr>
@@ -22 +22 @@
- *****************************************************************************/
-
+/*****************************************************************************
+ * intf_sys_t: description and status of interface
+ *****************************************************************************/
+struct intf_sys_t
+{
+    input_thread_t    * p_input;
+    thread_vcd_data_t * p_vcd;
+
+    vlc_bool_t          b_still;
+    vlc_bool_t          b_inf_still;
+    mtime_t             m_still_time;
+
+#if FINISHED
+    vcdplay_ctrl_t      control;
+#else 
+    int                 control;
+#endif
+    vlc_bool_t          b_click, b_move, b_key_pressed;
+};
+
-int vcdIntfStillTime( struct intf_thread_t *, int );
-int vcdIntfResetStillTime( intf_thread_t *p_intf );

modules/access/vcdx/vcdplayer.c

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
-5 2003/11/24 03:30:36
+6 2003/12/05 04:24:47
- *
- * This program is free software; you can redistribute it and/or modify
@@ -32 +32 @@
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc/intf.h>
-
-#include "vcd.h"
-#include "vcdplayer.h"
+#include "intf.h"
-
-#include <string.h>
@@ -184 +186 @@
-        /* FIXME */
-        p_vcd->in_still = wait_time - 1;
-        SLEEP_1_SEC_AND_HANDLE_EVENTS 
+   p_vcd->p_intf->p_sys->m_still_time = (wait_time - 1) * 1000000
-        return READ_STILL_FRAME;
-
+
+
+
+
+
-    }
-    vcdplayer_update_entry( p_input, 
@@ -209 +215 @@
-      /* Handle any wait time given */
-      if (-5 == p_vcd->in_still) {
-
-
-
+
+
+
+
+
+
+
+
+
+
-      }
-