Changeset 382926a8c14406854dae7eb79de693ffe1284ed0

Timestamp:

09/11/04 00:47:32 (4 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1099957652 +0000

git-parent:

[e56a6361d0a683a25522ece9b54dcad1c740ec56]

git-author:

Clément Stenac <zorglub@videolan.org> 1099957652 +0000

Message:

include services discovery in interface

Files:

• include/vlc_playlist.h (modified) (1 diff)
• modules/gui/wxwindows/menus.cpp (modified) (1 diff)
• modules/gui/wxwindows/playlist.cpp (modified) (8 diffs)
• modules/gui/wxwindows/wxwindows.h (modified) (2 diffs)
• src/playlist/playlist.c (modified) (3 diffs)
• src/playlist/services_discovery.c (modified) (1 diff)

include/vlc_playlist.h

@@ -232 +232 @@
-VLC_EXPORT( void, playlist_ServicesDiscoveryRemove, (playlist_t *, const char *));
-VLC_EXPORT( int, playlist_AddSDModules, (playlist_t *, char *));
+VLC_EXPORT( vlc_bool_t, playlist_IsServicesDiscoveryLoaded, ( playlist_t *,const char *));
+
-
-/* Item management functions (act on items) */

modules/gui/wxwindows/menus.cpp

@@ -978 +978 @@
-        if( p_intf->p_sys->p_popup_menu )
-        {
- 
+
-                p_intf->p_sys->p_popup_menu->FindItem( event.GetId() );
-        }

modules/gui/wxwindows/playlist.cpp

@@ -108 +108 @@
-    UpdateItem_Event,
-
+    MenuDummy_Event = wxID_HIGHEST + 999,
+
-    FirstView_Event = wxID_HIGHEST + 1000,
+    LastView_Event = wxID_HIGHEST + 1100,
+
+    FirstSD_Event = wxID_HIGHEST + 2000,
+    LastSD_Event = wxID_HIGHEST + 2100,
-};
-
@@ -206 +212 @@
-
-    p_view_menu = NULL;
+    p_sd_menu = SDMenu();
-
-    i_current_view = VIEW_SIMPLE;
@@ -222 +229 @@
-    manage_menu->Append( AddFile_Event, wxU(_("&Simple Add...")) );
-    manage_menu->Append( AddMRL_Event, wxU(_("&Add MRL...")) );
+    manage_menu->AppendSeparator();
+    manage_menu->Append( MenuDummy_Event, wxU(_("Services discovery")),
+                         p_sd_menu );
-    manage_menu->AppendSeparator();
-    manage_menu->Append( Open_Event, wxU(_("&Open Playlist...")) );
@@ -1091 +1101 @@
-void Playlist::OnSelectAll( wxCommandEvent& WXUNUSED(event) )
-{
-#if 0
-    for( long item = 0; item < listview->GetItemCount(); item++ )
-    {
-        listview->Select( item, TRUE );
-    }
-#endif
-}
-
@@ -1204 +1208 @@
-void Playlist::OnInfos( wxCommandEvent& WXUNUSED(event) )
-{
-    /* We use the first selected item, so find it */
-#if 0
-    long i_item = listview->GetNextItem( -1, wxLIST_NEXT_ALL,
-                                         wxLIST_STATE_SELECTED );
-    ShowInfos( i_item );
-#endif
-}
-
@@ -1221 +1219 @@
-        return;
-    }
-#if 0
-    long i_item = listview->GetNextItem( -1, wxLIST_NEXT_ALL,
-                                         wxLIST_STATE_SELECTED );
-
-    if( i_item >= 0 && i_item < p_playlist->i_size )
-    {
-       Rebuild();
-    }
-#endif
-    vlc_object_release( p_playlist );
-}
@@ -1267 +1256 @@
-        return;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    vlc_object_release( p_playlist );
-}
@@ -1338 +1344 @@
-
-    return p_view_menu;
+}
+
+wxMenu *Playlist::SDMenu()
+{
+
+    playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf,
+                              VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+    if( !p_playlist )
+    {
+        return NULL;
+    }
+    vlc_value_t val, val_list, text_list;
+    p_sd_menu = new wxMenu;
+
+    vlc_list_t *p_list = vlc_list_find( p_playlist, VLC_OBJECT_MODULE,
+                                        FIND_ANYWHERE );
+
+    int i_number = 0;
+    for( int i_index = 0; i_index < p_list->i_count; i_index++ )
+    {
+        module_t * p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+
+        if( !strcmp( p_parser->psz_capability, "services_discovery" ) )
+        {
+            p_sd_menu->AppendCheckItem( FirstSD_Event + i_number ,
+                       wxU( p_parser->psz_longname ? p_parser->psz_longname :
+                            p_parser->psz_shortname ) );
+
+            if( playlist_IsServicesDiscoveryLoaded( p_playlist,
+                                    p_parser->psz_shortname ) )
+            {
+                p_sd_menu->Check( FirstSD_Event + i_number, TRUE );
+            }
+
+            INSERT_ELEM( (void**)pp_sds, i_number, i_number,
+                         (void*)p_parser->psz_shortname );
+        }
+    }
+    vlc_list_release( p_list );
+    vlc_object_release( p_playlist );
+    return p_sd_menu;
-}
-

modules/gui/wxwindows/wxwindows.h

@@ -807 +807 @@
-
-    wxMenu *ViewMenu();
+    wxMenu *SDMenu();
-
-    void OnUp( wxCommandEvent& event);
@@ -850 +851 @@
-
-    wxMenu *p_view_menu;
+    wxMenu *p_sd_menu;
+
+    char **pp_sds;
-
-    ItemInfoDialog *iteminfo_dialog;

src/playlist/playlist.c

@@ -61 +61 @@
-playlist_t * __playlist_Create ( vlc_object_t *p_parent )
-{
+    int i_index;
-    playlist_t *p_playlist;
-    playlist_view_t *p_view;
@@ -91 +92 @@
-    val.b_bool = VLC_TRUE;
-    var_Set( p_playlist, "intf-show", val );
+
-
-    /* Variables to control playback */
@@ -924 +926 @@
-{
-    playlist_t *p_playlist = (playlist_t *)param;
+    int i_index;
-
-    //p_playlist->b_need_update = VLC_TRUE;

src/playlist/services_discovery.c

@@ -114 +114 @@
-}
-
+vlc_bool_t playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist,
+                                              const char *psz_module )
+{
+    int i;
+    vlc_mutex_lock( &p_playlist->object_lock );
+
+    for( i = 0 ; i< p_playlist->i_sds ; i ++ )
+    {
+        if( !strcmp( psz_module, p_playlist->pp_sds[i]->psz_module ) )
+        {
+            vlc_mutex_unlock( &p_playlist->object_lock );
+            return VLC_TRUE;
+        }
+    }
+    vlc_mutex_unlock( &p_playlist->object_lock );
+    return VLC_FALSE;
+}
+
+
-/**
- * Load all service discovery modules in a string