From: Clément Stenac <zorglub@videolan.org>
Date: Sat, 21 Jan 2006 17:44:07 +0000 (+0000)
Subject: Preparse items added through the directory access or directly to the interface (Refs... 
X-Git-Tag: 0.9.0-test0~12689
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3083fe224f71ff21ecb86fb98983e908ef3d0dad;p=vlc

Preparse items added through the directory access or directly to the interface (Refs:#192)
---

diff --git a/modules/gui/wxwidgets/dialogs.cpp b/modules/gui/wxwidgets/dialogs.cpp
index 3260198f9b..b4da350b5d 100644
--- a/modules/gui/wxwidgets/dialogs.cpp
+++ b/modules/gui/wxwidgets/dialogs.cpp
@@ -430,11 +430,12 @@ void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event )
             char *psz_utf8 = wxFromLocale( paths[i] );
             if( event.GetInt() )
                 playlist_Add( p_playlist, psz_utf8, psz_utf8,
-                              PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO),
+                              PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO) |
+                              (i ? PLAYLIST_PREPARSE : 0 ),
                               PLAYLIST_END );
             else
                 playlist_Add( p_playlist, psz_utf8, psz_utf8,
-                              PLAYLIST_APPEND, PLAYLIST_END );
+                              PLAYLIST_APPEND | PLAYLIST_PREPARSE , PLAYLIST_END );
             wxLocaleFree( psz_utf8 );
         }
     }
@@ -460,7 +461,8 @@ void DialogsProvider::OnOpenDirectory( wxCommandEvent& event )
         wxString path = p_dir_dialog->GetPath();
         char *psz_utf8 = wxFromLocale( path );
         playlist_Add( p_playlist, psz_utf8, psz_utf8,
-                      PLAYLIST_APPEND | (event.GetInt() ? PLAYLIST_GO : 0),
+                      PLAYLIST_APPEND | (event.GetInt() ? PLAYLIST_GO : 0) |
+                      (event.GetInt() ? 0 : PLAYLIST_PREPARSE ),
                       PLAYLIST_END );
         wxLocaleFree( psz_utf8 );
     }
diff --git a/modules/gui/wxwidgets/dialogs/open.cpp b/modules/gui/wxwidgets/dialogs/open.cpp
index 7bd52a3163..796bf041f0 100644
--- a/modules/gui/wxwidgets/dialogs/open.cpp
+++ b/modules/gui/wxwidgets/dialogs/open.cpp
@@ -1200,7 +1200,8 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
             }
         }
 
-        playlist_AddItem( p_playlist, p_item, PLAYLIST_APPEND, PLAYLIST_END );
+        playlist_AddItem( p_playlist, p_item, PLAYLIST_APPEND|PLAYLIST_PREPARSE,
+                          PLAYLIST_END );
 
         if( b_start )
         {
diff --git a/src/network/httpd.c b/src/network/httpd.c
index 0289358cc6..94bb3c6974 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -2553,7 +2553,7 @@ static void httpd_HostThread( httpd_host_t *host )
                             case 1: /* missing input - most likely */
                                 i_state = HTTPD_CLIENT_TLS_HS_IN;
                                 break;
-    
+
                             case 2: /* missing output */
                                 i_state = HTTPD_CLIENT_TLS_HS_OUT;
                                 break;
@@ -2563,8 +2563,7 @@ static void httpd_HostThread( httpd_host_t *host )
                     if( fd >= 0 )
                     {
                         httpd_client_t *cl;
-                        stats_UpdateInteger( host, "client_connections",
-                                             1 );
+                        stats_UpdateInteger( host, "client_connections", 1 );
                         stats_UpdateInteger( host, "active_connections", 1 );
                         cl = httpd_ClientNew( fd, &sock, i_sock_size, p_tls );
                         p_tls = NULL;
diff --git a/src/playlist/item-ext.c b/src/playlist/item-ext.c
index 7f0dd22a50..b52ed43482 100644
--- a/src/playlist/item-ext.c
+++ b/src/playlist/item-ext.c
@@ -243,6 +243,11 @@ int playlist_AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
         p_playlist->status.i_status = PLAYLIST_RUNNING;
     }
 
+    if( i_mode & PLAYLIST_PREPARSE )
+    {
+        playlist_PreparseEnqueue( p_playlist, &p_item->input );
+    }
+
     vlc_mutex_unlock( &p_playlist->object_lock );
 
     if( b_end == VLC_FALSE )
@@ -363,6 +368,10 @@ int playlist_NodeAddItem( playlist_t *p_playlist, playlist_item_t *p_item,
         }
         p_playlist->status.i_status = PLAYLIST_RUNNING;
     }
+    if( i_mode & PLAYLIST_PREPARSE )
+    {
+        playlist_PreparseEnqueue( p_playlist, &p_item->input );
+    }
 
     vlc_mutex_unlock( &p_playlist->object_lock );