* src/input/control.c: bookmarks support is back (will need some more work though).

* modules/gui/wxwindows/bookmarks.cpp: bookmarks support is back.

diff --git a/include/vlc_input.h b/include/vlc_input.h
index dfeb86054b7cd261e25ffd559a4eab1bd395f281..8ae8ce1b1fe552d6083d91bdb04fb016826bbde3 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -321,10 +321,15 @@ enum input_query_e
     /* Meta datas */
     INPUT_ADD_INFO,   /* arg1= char * arg2= char * arg3=...  res=can fail    */
     INPUT_GET_INFO,   /* arg1= char * arg2= char * arg3= char ** res=can fail*/
-
     INPUT_SET_NAME,   /* arg1= char * res=can fail    */
 
-    /* XXX: all next query aren't working for now */
+    /* Input config options */
+    INPUT_ADD_OPTION,      /* arg1= char * arg2= char *  res=can fail*/
+
+    /* Input properties */
+    INPUT_GET_BYTE_POSITION,     /* arg1= int64_t *       res=    */
+    INPUT_SET_BYTE_SIZE,         /* arg1= int64_t *       res=    */
+
     /* bookmarks */
     INPUT_GET_BOOKMARKS,   /* arg1= seekpoint_t *** arg2= int * res=can fail */
     INPUT_CLEAR_BOOKMARKS, /* res=can fail */

diff --git a/modules/gui/wxwindows/bookmarks.cpp b/modules/gui/wxwindows/bookmarks.cpp
index 0415668b31c7874334f50876db9b942f373cf590..0bfe6b0c7bbca9336e88cd7f10e3b1ae462f8cf0 100644 (file)
--- a/modules/gui/wxwindows/bookmarks.cpp
+++ b/modules/gui/wxwindows/bookmarks.cpp
@@ -84,6 +84,11 @@ private:
 
     wxListView *list_ctrl;
 };
+
+/*****************************************************************************
+ * Event Table.
+ *****************************************************************************/
+
 DEFINE_LOCAL_EVENT_TYPE( wxEVT_BOOKMARKS );
 
 BEGIN_EVENT_TABLE(BookmarksDialog, wxFrame)
@@ -237,9 +242,11 @@ BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf, wxWindow *p_parent )
     panel_sizer->Add( button_add, 0, wxEXPAND );
     panel_sizer->Add( button_del, 0, wxEXPAND );
     panel_sizer->Add( button_clear, 0, wxEXPAND );
+
     panel_sizer->Add( button_edit, 0, wxEXPAND );
     panel_sizer->Add( 0, 0, 1 );
     panel_sizer->Add( button_extract, 0, wxEXPAND );
+
     panel->SetSizerAndFit( panel_sizer );
 
     list_ctrl = new wxListView( main_panel, -1,
@@ -345,21 +352,12 @@ void BookmarksDialog::OnAdd( wxCommandEvent& event )
     bookmark.i_byte_offset = 0;
     bookmark.i_time_offset = 0;
 
-
-    /* FIXME --fenrir
-     * - stream_Tell can't be use (not reentrant)
-     * - nobody except src/input/ could touch p_input
-     *   -> create new INPUT_CONTROL ...
-     */
-#if 0
     var_Get( p_input, "position", &pos );
     bookmark.psz_name = NULL;
-    bookmark.i_byte_offset = stream_Tell( p_input->input.p_stream );
-      (int64_t)((double)pos.f_float * p_input->input.p_access->info.i_size);
+    input_Control( p_input, INPUT_GET_BYTE_POSITION, &bookmark.i_byte_offset );
     var_Get( p_input, "time", &pos );
     bookmark.i_time_offset = pos.i_time;
     input_Control( p_input, INPUT_ADD_BOOKMARK, &bookmark );
-#endif
     vlc_object_release( p_input );
 
     Update();

diff --git a/src/input/control.c b/src/input/control.c
index 8fbd0963388ebdd182221d6d7568f86487fac2d3..4aa62a5f7d8b59c670fc599a2bf9f883d5bfd5ae 100644 (file)
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -55,10 +55,10 @@ int input_Control( input_thread_t *p_input, int i_query, ...  )
 
 int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
 {
-    /* seekpoint_t *p_bkmk, ***ppp_bkmk;
+    seekpoint_t *p_bkmk, ***ppp_bkmk;
     int i_bkmk = 0;
     int *pi_bkmk;
-    */
+
     int i_int, *pi_int;
     double f, *pf;
     int64_t i_64, *pi_64;
@@ -247,166 +247,245 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
             return VLC_SUCCESS;
         }
 
-#if 0
         case INPUT_ADD_BOOKMARK:
             p_bkmk = (seekpoint_t *)va_arg( args, seekpoint_t * );
             p_bkmk = vlc_seekpoint_Duplicate( p_bkmk );
+
+            vlc_mutex_lock( &p_input->input.p_item->lock );
             if( !p_bkmk->psz_name )
             {
                  asprintf( &p_bkmk->psz_name, _("Bookmark %i"),
-                           p_input->i_bookmarks );
+                           p_input->i_bookmark );
             }
-            TAB_APPEND( p_input->i_bookmarks, p_input->pp_bookmarks, p_bkmk );
+
+            TAB_APPEND( p_input->i_bookmark, p_input->bookmark, p_bkmk );
 
             /* Reflect the changes on the object var */
             var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 );
             {
+                vlc_value_t val, text;
                 int i;
-                for( i = 0; i < p_input->i_bookmarks; i++ )
+
+                for( i = 0; i < p_input->i_bookmark; i++ )
                 {
                     val.i_int = i;
-                    text.psz_string = p_input->pp_bookmarks[i]->psz_name;
+                    text.psz_string = p_input->bookmark[i]->psz_name;
                     var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE,
                                 &val, &text );
                 }
             }
+            vlc_mutex_unlock( &p_input->input.p_item->lock );
 
             UpdateBookmarksOption( p_input );
 
-            i_ret = VLC_SUCCESS;
+            return VLC_SUCCESS;
             break;
 
         case INPUT_CHANGE_BOOKMARK:
-             p_bkmk = (seekpoint_t *)va_arg( args, seekpoint_t * );
-             i_bkmk = (int)va_arg( args, int );
-
-             if( i_bkmk < p_input->i_bookmarks )
-             {
-                 p_input->pp_bookmarks[i_bkmk] = p_bkmk;
-
-                 /* Reflect the changes on the object var */
-                 var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 );
-                 for( i = 0; i < p_input->i_bookmarks; i++ )
-                 {
-                     val.i_int = i;
-                     text.psz_string = p_input->pp_bookmarks[i]->psz_name;
-                     var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE,
-                                 &val, &text );
-                 }
-             }
-             UpdateBookmarksOption( p_input );
-
-             i_ret = VLC_SUCCESS;
-             break;
+            p_bkmk = (seekpoint_t *)va_arg( args, seekpoint_t * );
+            i_bkmk = (int)va_arg( args, int );
+
+            vlc_mutex_lock( &p_input->input.p_item->lock );
+            if( i_bkmk < p_input->i_bookmark )
+            {
+                vlc_value_t val, text;
+                int i;
+
+                p_input->bookmark[i_bkmk] = p_bkmk;
+
+                /* Reflect the changes on the object var */
+                var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 );
+                for( i = 0; i < p_input->i_bookmark; i++ )
+                {
+                    val.i_int = i;
+                    text.psz_string = p_input->bookmark[i]->psz_name;
+                    var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE,
+                                &val, &text );
+                }
+            }
+            vlc_mutex_unlock( &p_input->input.p_item->lock );
+
+            UpdateBookmarksOption( p_input );
+
+            return VLC_SUCCESS;
+            break;
 
         case INPUT_DEL_BOOKMARK:
             i_bkmk = (int)va_arg( args, int );
-            if( i_bkmk < p_input->i_bookmarks )
+
+            vlc_mutex_lock( &p_input->input.p_item->lock );
+            if( i_bkmk < p_input->i_bookmark )
             {
+                vlc_value_t val, text;
                 int i;
-                p_bkmk = p_input->pp_bookmarks[i_bkmk];
-                TAB_REMOVE( p_input->i_bookmarks, p_input->pp_bookmarks,
+
+                p_bkmk = p_input->bookmark[i_bkmk];
+                TAB_REMOVE( p_input->i_bookmark, p_input->bookmark,
                             p_bkmk );
                 vlc_seekpoint_Delete( p_bkmk );
 
                 /* Reflect the changes on the object var */
                 var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 );
-                for( i = 0; i < p_input->i_bookmarks; i++ )
+                for( i = 0; i < p_input->i_bookmark; i++ )
                 {
                     val.i_int = i;
-                    text.psz_string = p_input->pp_bookmarks[i]->psz_name;
+                    text.psz_string = p_input->bookmark[i]->psz_name;
                     var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE,
                                 &val, &text );
                 }
+                vlc_mutex_unlock( &p_input->input.p_item->lock );
 
                 UpdateBookmarksOption( p_input );
 
-                i_ret = VLC_SUCCESS;
+                return VLC_SUCCESS;
             }
-            else i_ret = VLC_EGENERIC;
+            vlc_mutex_unlock( &p_input->input.p_item->lock );
+
+            return VLC_EGENERIC;
             break;
 
         case INPUT_GET_BOOKMARKS:
             ppp_bkmk = (seekpoint_t ***)va_arg( args, seekpoint_t *** );
             pi_bkmk = (int *)va_arg( args, int * );
-            if( p_input->i_bookmarks )
+
+            vlc_mutex_lock( &p_input->input.p_item->lock );
+            if( p_input->i_bookmark )
             {
                 int i;
 
-                *pi_bkmk = p_input->i_bookmarks;
+                *pi_bkmk = p_input->i_bookmark;
                 *ppp_bkmk = malloc( sizeof(seekpoint_t *) *
-                              p_input->i_bookmarks );
-                for( i = 0; i < p_input->i_bookmarks; i++ )
+                                    p_input->i_bookmark );
+                for( i = 0; i < p_input->i_bookmark; i++ )
                 {
                     (*ppp_bkmk)[i] =
-                        vlc_seekpoint_Duplicate(p_input->pp_bookmarks[i]);
+                        vlc_seekpoint_Duplicate(p_input->bookmark[i]);
                 }
-                i_ret = VLC_SUCCESS;
+
+                vlc_mutex_unlock( &p_input->input.p_item->lock );
+                return VLC_SUCCESS;
             }
             else
             {
                 *ppp_bkmk = NULL;
                 *pi_bkmk = 0;
-                i_ret = VLC_EGENERIC;
+
+                vlc_mutex_unlock( &p_input->input.p_item->lock );
+                return VLC_EGENERIC;
             }
             break;
 
         case INPUT_CLEAR_BOOKMARKS:
-            if( p_input->i_bookmarks )
+
+            vlc_mutex_lock( &p_input->input.p_item->lock );
+            if( p_input->i_bookmark )
             {
                 int i;
 
-                for( i = p_input->i_bookmarks - 1; i >= 0; i-- )
+                for( i = p_input->i_bookmark - 1; i >= 0; i-- )
                 {
-                    p_bkmk = p_input->pp_bookmarks[i];
-                    TAB_REMOVE( p_input->i_bookmarks, p_input->pp_bookmarks,
+                    p_bkmk = p_input->bookmark[i];
+                    TAB_REMOVE( p_input->i_bookmark, p_input->bookmark,
                                 p_bkmk );
                     vlc_seekpoint_Delete( p_bkmk );
                 }
                 var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 );
             }
+            vlc_mutex_unlock( &p_input->input.p_item->lock );
 
             UpdateBookmarksOption( p_input );
 
-            i_ret = VLC_SUCCESS;
+            return VLC_SUCCESS;
             break;
 
         case INPUT_SET_BOOKMARK:
             i_bkmk = (int)va_arg( args, int );
-            if( i_bkmk >= 0 && i_bkmk < p_input->i_bookmarks )
+
+            vlc_mutex_lock( &p_input->input.p_item->lock );
+            if( i_bkmk >= 0 && i_bkmk < p_input->i_bookmark )
             {
                 vlc_value_t pos;
-                vlc_mutex_unlock( &p_input->stream.stream_lock );
-                if( p_input->pp_bookmarks[i_bkmk]->i_byte_offset ||
-                    ( !p_input->pp_bookmarks[i_bkmk]->i_byte_offset &&
-                      !p_input->pp_bookmarks[i_bkmk]->i_time_offset ) )
+                int i_ret;
+
+                if( p_input->bookmark[i_bkmk]->i_time_offset )
+                {
+                    pos.i_time = p_input->bookmark[i_bkmk]->i_time_offset;
+                    i_ret = var_Set( p_input, "time", pos );
+                }
+                else if( p_input->bookmark[i_bkmk]->i_byte_offset )
                 {
-                    pos.f_float = p_input->pp_bookmarks[i_bkmk]->i_byte_offset/
-                        (double)p_input->stream.p_selected_area->i_size;
+                    pos.f_float = !p_input->input.p_stream ? 0 :
+                        p_input->bookmark[i_bkmk]->i_byte_offset /
+                        stream_Size( p_input->input.p_stream );
                     i_ret = var_Set( p_input, "position", pos );
                 }
-                else if( p_input->pp_bookmarks[i_bkmk]->i_time_offset )
+                else
                 {
-                    pos.i_time = p_input->pp_bookmarks[i_bkmk]->i_time_offset;
-                    i_ret = var_Set( p_input, "time", pos );
+                    pos.f_float = 0;
+                    i_ret = var_Set( p_input, "position", pos );
                 }
-                vlc_mutex_lock( &p_input->stream.stream_lock );
+
+                vlc_mutex_unlock( &p_input->input.p_item->lock );
+                return i_ret;
             }
             else
             {
-                i_ret = VLC_EGENERIC;
+                vlc_mutex_unlock( &p_input->input.p_item->lock );
+                return VLC_EGENERIC;
             }
+
+            break;
+
+        case INPUT_ADD_OPTION:
+        {
+            char *psz_option = (char *)va_arg( args, char * );
+            char *psz_value = (char *)va_arg( args, char * );
+            int i;
+
+            vlc_mutex_lock( &p_input->input.p_item->lock );
+            /* Check if option already exists */            
+            for( i = 0; i < p_input->input.p_item->i_options; i++ )
+            {
+                if( !strncmp( p_input->input.p_item->ppsz_options[i],
+                              psz_option, strlen( psz_option ) ) &&
+                    p_input->input.p_item->ppsz_options[i][strlen(psz_option)]
+                      == '=' )
+                {
+                    free( p_input->input.p_item->ppsz_options[i] );
+                    break;
+                }
+            }
+            if( i == p_input->input.p_item->i_options )
+            {
+                p_input->input.p_item->i_options++;
+                p_input->input.p_item->ppsz_options =
+                    realloc( p_input->input.p_item->ppsz_options,
+                             p_input->input.p_item->i_options *
+                             sizeof(char **) );
+            }
+
+            asprintf( &p_input->input.p_item->ppsz_options[i],
+                      "%s=%s", psz_option, psz_value ) ;
+            vlc_mutex_unlock( &p_input->input.p_item->lock );
+
+            return VLC_SUCCESS;
+            break;
+        }
+
+        case INPUT_GET_BYTE_POSITION:
+            pi_64 = (int64_t*)va_arg( args, int64_t * );
+            *pi_64 = !p_input->input.p_stream ? 0 :
+                stream_Tell( p_input->input.p_stream );
+            return VLC_SUCCESS;
+            break;
+
+        case INPUT_SET_BYTE_SIZE:
+            pi_64 = (int64_t*)va_arg( args, int64_t * );
+            *pi_64 = !p_input->input.p_stream ? 0 :
+                stream_Size( p_input->input.p_stream );
+            return VLC_SUCCESS;
             break;
 
-#endif
-        case INPUT_GET_BOOKMARKS:
-        case INPUT_CLEAR_BOOKMARKS:
-        case INPUT_ADD_BOOKMARK:
-        case INPUT_CHANGE_BOOKMARK:
-        case INPUT_DEL_BOOKMARK:
-        case INPUT_SET_BOOKMARK:
-            /* FIXME */
-            msg_Err( p_input, "unimplemented query in input_vaControl" );
         default:
             msg_Err( p_input, "unknown query in input_vaControl" );
             return VLC_EGENERIC;
@@ -427,39 +506,36 @@ static void NotifyPlaylist( input_thread_t *p_input )
 
 static void UpdateBookmarksOption( input_thread_t *p_input )
 {
-#if 0
     int i, i_len = 0;
     char *psz_value = NULL, *psz_next = NULL;
-    /* FIXME */
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
 
-    for( i = 0; i < p_input->i_bookmarks; i++ )
+    vlc_mutex_lock( &p_input->input.p_item->lock );
+    for( i = 0; i < p_input->i_bookmark; i++ )
     {
         asprintf( &psz_value, "{name=%s,bytes="I64Fd",time="I64Fd"}",
-                  p_input->pp_bookmarks[i]->psz_name,
-                  p_input->pp_bookmarks[i]->i_byte_offset,
-                  p_input->pp_bookmarks[i]->i_time_offset/1000000 );
+                  p_input->bookmark[i]->psz_name,
+                  p_input->bookmark[i]->i_byte_offset,
+                  p_input->bookmark[i]->i_time_offset/1000000 );
         i_len += strlen( psz_value );
         free( psz_value );
     }
-    for( i = 0; i < p_input->i_bookmarks; i++ )
+    for( i = 0; i < p_input->i_bookmark; i++ )
     {
-        if( !i ) psz_value = psz_next = malloc( i_len + p_input->i_bookmarks );
+        if( !i ) psz_value = psz_next = malloc( i_len + p_input->i_bookmark );
 
         sprintf( psz_next, "{name=%s,bytes="I64Fd",time="I64Fd"}",
-                 p_input->pp_bookmarks[i]->psz_name,
-                 p_input->pp_bookmarks[i]->i_byte_offset,
-                 p_input->pp_bookmarks[i]->i_time_offset/1000000 );
+                 p_input->bookmark[i]->psz_name,
+                 p_input->bookmark[i]->i_byte_offset,
+                 p_input->bookmark[i]->i_time_offset/1000000 );
 
         psz_next += strlen( psz_next );
-        if( i < p_input->i_bookmarks - 1)
+        if( i < p_input->i_bookmark - 1)
         {
             *psz_next = ','; psz_next++;
         }
     }
+    vlc_mutex_unlock( &p_input->input.p_item->lock );
+
     input_Control( p_input, INPUT_ADD_OPTION, "bookmarks",
                    psz_value ? psz_value : "" );
-
-    vlc_mutex_lock( &p_input->stream.stream_lock );
-#endif
 }