Commit 3083fe22 authored by Clément Stenac's avatar Clément Stenac

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

parent f93e275d
......@@ -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 );
}
......
......@@ -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 )
{
......
......@@ -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;
......
......@@ -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 );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment