X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fpda%2Fpda_callbacks.c;h=f0e8dd4afad8ce8911a9e34b26bbd9e6199d477b;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=537328bcbbf50c22920288507de8b904aa2a75ee;hpb=d96dc743e794e24b29067e96409fea89af481676;p=vlc diff --git a/modules/gui/pda/pda_callbacks.c b/modules/gui/pda/pda_callbacks.c index 537328bcbb..f0e8dd4afa 100644 --- a/modules/gui/pda/pda_callbacks.c +++ b/modules/gui/pda/pda_callbacks.c @@ -1,10 +1,10 @@ /***************************************************************************** * pda_callbacks.c : Callbacks for the pda Linux Gtk+ plugin. ***************************************************************************** - * Copyright (C) 2000, 2001 VideoLAN - * $Id: pda_callbacks.c,v 1.19 2003/11/30 11:22:29 jpsaman Exp $ + * Copyright (C) 2000, 2001 the VideoLAN team + * $Id$ * - * Authors: Jean-Paul Saman + * Authors: Jean-Paul Saman * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,20 +18,18 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ #include /* off_t */ -#include #include -#include -#include +#include +#include +#include -#include -#include #include #include #include @@ -87,10 +85,11 @@ void * E_(__GtkGetIntf)( GtkWidget * widget ) return p_data; } -void PlaylistAddItem(GtkWidget *widget, gchar *name) +void PlaylistAddItem(GtkWidget *widget, gchar *name, char **ppsz_options, int i_size) { intf_thread_t *p_intf = GtkGetIntf( widget ); playlist_t *p_playlist; + int i_id , i_pos=0; GtkTreeView *p_tvplaylist = NULL; p_playlist = (playlist_t *) @@ -109,9 +108,11 @@ void PlaylistAddItem(GtkWidget *widget, gchar *name) GtkTreeIter p_play_iter; p_play_model = gtk_tree_view_get_model(p_tvplaylist); - + if (p_play_model) { + int i; + /* Add a new row to the playlist treeview model */ gtk_list_store_append (GTK_LIST_STORE(p_play_model), &p_play_iter); gtk_list_store_set (GTK_LIST_STORE(p_play_model), &p_play_iter, @@ -124,15 +125,23 @@ void PlaylistAddItem(GtkWidget *widget, gchar *name) #if 0 if (p_intf->p_sys->b_autoplayfile) { - playlist_Add( p_playlist, (const char*)name, 0, 0, + playlist_Add( p_playlist, (const char*)name, (const char**)ppsz_options, i_size, PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END); } else #endif { - playlist_Add( p_playlist, (const char*)name, 0, 0, - PLAYLIST_APPEND, PLAYLIST_END ); - } + i_id = playlist_AddExt( p_playlist, (const char*)name, + (const char*)name, + PLAYLIST_APPEND, PLAYLIST_END, + (mtime_t) 0, + (const char **) ppsz_options, i_pos ); + } + + /* Cleanup memory */ + for (i=0; iobject_lock ); for( i_dummy = 0; i_dummy < p_playlist->i_size ; i_dummy++ ) { - ppsz_text[0] = p_playlist->pp_items[i_dummy]->psz_name; + ppsz_text[0] = p_playlist->pp_items[i_dummy]->input.psz_name; ppsz_text[1] = "no info"; gtk_list_store_append (p_list, &iter); gtk_list_store_set (p_list, &iter, @@ -169,9 +179,9 @@ void PlaylistRebuildListStore( GtkListStore * p_list, playlist_t * p_playlist ) void ReadDirectory(intf_thread_t *p_intf, GtkListStore *p_list, char *psz_dir ) { GtkTreeIter iter; - struct dirent **namelist; - struct passwd *pw; - struct group *grp; + struct dirent **pp_namelist; + struct passwd *p_pw; + struct group *p_grp; struct stat st; int n=-1, status=-1; @@ -182,7 +192,7 @@ void ReadDirectory(intf_thread_t *p_intf, GtkListStore *p_list, char *psz_dir ) if (status<0) msg_Dbg(p_intf, "permision denied" ); } - n = scandir(".", &namelist, 0, alphasort); + n = scandir(".", &pp_namelist, 0, alphasort); if (n<0) perror("scandir"); @@ -194,14 +204,14 @@ void ReadDirectory(intf_thread_t *p_intf, GtkListStore *p_list, char *psz_dir ) if (lstat("..", &st)==0) { /* user, group */ - pw = getpwuid(st.st_uid); - grp = getgrgid(st.st_gid); + p_pw = getpwuid(st.st_uid); + p_grp = getgrgid(st.st_gid); /* XXX : kludge temporaire pour yopy */ ppsz_text[0] = ".."; ppsz_text[1] = get_file_perms(st); - ppsz_text[2] = pw->pw_name; - ppsz_text[3] = grp->gr_name; + ppsz_text[2] = p_pw->pw_name; + ppsz_text[3] = p_grp->gr_name; /* Add a new row to the model */ gtk_list_store_append (p_list, &iter); @@ -217,19 +227,19 @@ void ReadDirectory(intf_thread_t *p_intf, GtkListStore *p_list, char *psz_dir ) } /* kludge */ for (i=0; id_name[0] != '.') && - (lstat(namelist[i]->d_name, &st)==0)) + { + if ((pp_namelist[i]->d_name[0] != '.') && + (lstat(pp_namelist[i]->d_name, &st)==0)) { /* user, group */ - pw = getpwuid(st.st_uid); - grp = getgrgid(st.st_gid); + p_pw = getpwuid(st.st_uid); + p_grp = getgrgid(st.st_gid); /* This is a list of strings. */ - ppsz_text[0] = namelist[i]->d_name; + ppsz_text[0] = pp_namelist[i]->d_name; ppsz_text[1] = get_file_perms(st); - ppsz_text[2] = pw->pw_name; - ppsz_text[3] = grp->gr_name; + ppsz_text[2] = p_pw->pw_name; + ppsz_text[3] = p_grp->gr_name; #if 0 msg_Dbg(p_intf, "(%d) file: %s permission: %s user: %s group: %s", i, ppsz_text[0], ppsz_text[1], ppsz_text[2], ppsz_text[3] ); #endif @@ -245,134 +255,123 @@ void ReadDirectory(intf_thread_t *p_intf, GtkListStore *p_list, char *psz_dir ) if (ppsz_text[1]) free(ppsz_text[1]); } } - free(namelist); + free(pp_namelist); } } static char *get_file_perms(const struct stat st) { - char *perm; + char *psz_perm; - perm = (char *) malloc(sizeof(char)*10); - strncpy( perm, "----------", sizeof("----------")); + psz_perm = (char *) malloc(sizeof(char)*10); + strncpy( psz_perm, "----------", sizeof("----------")); /* determine permission modes */ if (S_ISLNK(st.st_mode)) - perm[0]= 'l'; + psz_perm[0]= 'l'; else if (S_ISDIR(st.st_mode)) - perm[0]= 'd'; + psz_perm[0]= 'd'; else if (S_ISCHR(st.st_mode)) - perm[0]= 'c'; + psz_perm[0]= 'c'; else if (S_ISBLK(st.st_mode)) - perm[0]= 'b'; + psz_perm[0]= 'b'; else if (S_ISFIFO(st.st_mode)) - perm[0]= 'f'; + psz_perm[0]= 'f'; else if (S_ISSOCK(st.st_mode)) - perm[0]= 's'; + psz_perm[0]= 's'; else if (S_ISREG(st.st_mode)) - perm[0]= '-'; + psz_perm[0]= '-'; else /* Unknown type is an error */ - perm[0]= '?'; + psz_perm[0]= '?'; /* Get file permissions */ /* User */ if (st.st_mode & S_IRUSR) - perm[1]= 'r'; + psz_perm[1]= 'r'; if (st.st_mode & S_IWUSR) - perm[2]= 'w'; + psz_perm[2]= 'w'; if (st.st_mode & S_IXUSR) { if (st.st_mode & S_ISUID) - perm[3] = 's'; + psz_perm[3] = 's'; else - perm[3]= 'x'; + psz_perm[3]= 'x'; } else if (st.st_mode & S_ISUID) - perm[3] = 'S'; + psz_perm[3] = 'S'; /* Group */ if (st.st_mode & S_IRGRP) - perm[4]= 'r'; + psz_perm[4]= 'r'; if (st.st_mode & S_IWGRP) - perm[5]= 'w'; + psz_perm[5]= 'w'; if (st.st_mode & S_IXGRP) { if (st.st_mode & S_ISGID) - perm[6] = 's'; + psz_perm[6] = 's'; else - perm[6]= 'x'; + psz_perm[6]= 'x'; } else if (st.st_mode & S_ISGID) - perm[6] = 'S'; + psz_perm[6] = 'S'; /* Other */ if (st.st_mode & S_IROTH) - perm[7]= 'r'; + psz_perm[7]= 'r'; if (st.st_mode & S_IWOTH) - perm[8]= 'w'; + psz_perm[8]= 'w'; if (st.st_mode & S_IXOTH) { - // 'sticky' bit + /* 'sticky' bit */ if (st.st_mode &S_ISVTX) - perm[9] = 't'; + psz_perm[9] = 't'; else - perm[9]= 'x'; + psz_perm[9]= 'x'; } else if (st.st_mode &S_ISVTX) - perm[9]= 'T'; + psz_perm[9]= 'T'; - return perm; + return psz_perm; } /* * Main interface callbacks */ -gboolean -onPDADeleteEvent (GtkWidget *widget, - GdkEvent *event, - gpointer user_data) +gboolean onPDADeleteEvent(GtkWidget *widget, GdkEvent *event, gpointer user_data) { intf_thread_t *p_intf = GtkGetIntf( widget ); vlc_mutex_lock( &p_intf->change_lock ); - p_intf->p_vlc->b_die = VLC_TRUE; + vlc_object_kill( p_intf->p_libvlc ); vlc_mutex_unlock( &p_intf->change_lock ); - msg_Dbg( p_intf, "about to exit vlc ... signalled" ); + msg_Dbg( p_intf, "about to exit vlc ... signaled" ); return TRUE; } - -void -onRewind (GtkButton *button, - gpointer user_data) +void onRewind(GtkButton *button, gpointer user_data) { - intf_thread_t * p_intf = GtkGetIntf( button ); + intf_thread_t *p_intf = GtkGetIntf( button ); if (p_intf->p_sys->p_input != NULL) { - input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_SLOWER ); + var_SetVoid( p_intf->p_sys->p_input, "rate-slower" ); } } - -void -onPause (GtkButton *button, - gpointer user_data) +void onPause(GtkButton *button, gpointer user_data) { - intf_thread_t * p_intf = GtkGetIntf( button ); + intf_thread_t *p_intf = GtkGetIntf( button ); if (p_intf->p_sys->p_input != NULL) { - input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PAUSE ); + var_SetInteger( p_intf->p_sys->p_input, "state", PAUSE_S ); } } -void -onPlay (GtkButton *button, - gpointer user_data) +void onPlay(GtkButton *button, gpointer user_data) { - intf_thread_t * p_intf = GtkGetIntf( GTK_WIDGET( button ) ); - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + intf_thread_t *p_intf = GtkGetIntf( GTK_WIDGET( button ) ); + playlist_t *p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); if (p_playlist) { @@ -381,6 +380,7 @@ onPlay (GtkButton *button, { vlc_mutex_unlock( &p_playlist->object_lock ); playlist_Play( p_playlist ); + gdk_window_lower( p_intf->p_sys->p_window->window ); } else { @@ -390,42 +390,35 @@ onPlay (GtkButton *button, } } - -void -onStop (GtkButton *button, - gpointer user_data) +void onStop(GtkButton *button, gpointer user_data) { - intf_thread_t * p_intf = GtkGetIntf( GTK_WIDGET( button ) ); - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + intf_thread_t *p_intf = GtkGetIntf( GTK_WIDGET( button ) ); + playlist_t *p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); if (p_playlist) { playlist_Stop( p_playlist ); vlc_object_release( p_playlist ); + gdk_window_raise( p_intf->p_sys->p_window->window ); } } - -void -onForward (GtkButton *button, - gpointer user_data) +void onForward(GtkButton *button, gpointer user_data) { intf_thread_t *p_intf = GtkGetIntf( button ); if (p_intf->p_sys->p_input != NULL) { - input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_FASTER ); + var_SetVoid( p_intf->p_sys->p_input, "rate-faster" ); } } -void -onAbout (GtkButton *button, - gpointer user_data) +void onAbout(GtkButton *button, gpointer user_data) { intf_thread_t *p_intf = GtkGetIntf( GTK_WIDGET(button) ); - // Toggle notebook + /* Toggle notebook */ if (p_intf->p_sys->p_notebook) { gtk_widget_show( GTK_WIDGET(p_intf->p_sys->p_notebook) ); @@ -433,14 +426,11 @@ onAbout (GtkButton *button, } } - -gboolean -SliderRelease (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) +gboolean SliderRelease(GtkWidget *widget, GdkEventButton *event, gpointer user_data) { intf_thread_t *p_intf = GtkGetIntf( widget ); + msg_Dbg( p_intf, "SliderButton Release" ); vlc_mutex_lock( &p_intf->change_lock ); p_intf->p_sys->b_slider_free = 1; vlc_mutex_unlock( &p_intf->change_lock ); @@ -448,179 +438,174 @@ SliderRelease (GtkWidget *widget, return TRUE; } - -gboolean -SliderPress (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) +gboolean SliderPress(GtkWidget *widget, GdkEventButton *event, gpointer user_data) { intf_thread_t *p_intf = GtkGetIntf( widget ); + msg_Dbg( p_intf, "SliderButton Press" ); vlc_mutex_lock( &p_intf->change_lock ); p_intf->p_sys->b_slider_free = 0; vlc_mutex_unlock( &p_intf->change_lock ); - return TRUE; + return FALSE; } -void addSelectedToPlaylist(GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer *userdata) +void SliderMove(GtkRange *range, GtkScrollType scroll, gpointer user_data) { - gchar *filename; + intf_thread_t *p_intf = GtkGetIntf( range ); + msg_Dbg( p_intf, "SliderButton Move" ); +} + + +void addSelectedToPlaylist(GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer *userdata) +{ + gchar *psz_filename; - gtk_tree_model_get(model, iter, 0, &filename, -1); + gtk_tree_model_get(model, iter, 0, &psz_filename, -1); - PlaylistAddItem(GTK_WIDGET(userdata), filename); + PlaylistAddItem(GTK_WIDGET(userdata), psz_filename, 0, 0); } -void -onFileListRow (GtkTreeView *treeview, - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data) +void onFileListRow(GtkTreeView *treeview, GtkTreePath *path, + GtkTreeViewColumn *column, gpointer user_data) { intf_thread_t *p_intf = GtkGetIntf( GTK_WIDGET(treeview) ); - GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview); + GtkTreeSelection *p_selection = gtk_tree_view_get_selection(treeview); - if (gtk_tree_selection_count_selected_rows(selection) == 1) + if (gtk_tree_selection_count_selected_rows(p_selection) == 1) { struct stat st; - GtkTreeModel *model; + GtkTreeModel *p_model; GtkTreeIter iter; - gchar *filename; + gchar *psz_filename; /* This might be a directory selection */ - model = gtk_tree_view_get_model(treeview); - if (!model) + p_model = gtk_tree_view_get_model(treeview); + if (!p_model) { msg_Err(p_intf, "PDA: Filelist model contains a NULL pointer\n" ); return; } - if (!gtk_tree_model_get_iter(model, &iter, path)) + if (!gtk_tree_model_get_iter(p_model, &iter, path)) { msg_Err( p_intf, "PDA: Could not get iter from model" ); return; } - gtk_tree_model_get(model, &iter, 0, &filename, -1); - if (stat((char*)filename, &st)==0) + gtk_tree_model_get(p_model, &iter, 0, &psz_filename, -1); + if (stat((char*)psz_filename, &st)==0) { if (S_ISDIR(st.st_mode)) { - GtkListStore *p_model = NULL; + GtkListStore *p_store = NULL; /* Get new directory listing */ - p_model = gtk_list_store_new (5, + p_store = gtk_list_store_new (5, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_STRING, G_TYPE_STRING); - if (p_model) + if (p_store) { - ReadDirectory(p_intf, p_model, filename); + ReadDirectory(p_intf, p_store, psz_filename); /* Update TreeView with new model */ - gtk_tree_view_set_model(treeview, (GtkTreeModel*) p_model); - g_object_unref(p_model); + gtk_tree_view_set_model(treeview, (GtkTreeModel*) p_store); + g_object_unref(p_store); } } - else - { - gtk_tree_selection_selected_foreach(selection, (GtkTreeSelectionForeachFunc) &addSelectedToPlaylist, (gpointer) treeview); - } } } - else - { - gtk_tree_selection_selected_foreach(selection, (GtkTreeSelectionForeachFunc) &addSelectedToPlaylist, (gpointer) treeview); - } } -void -onAddFileToPlaylist (GtkButton *button, - gpointer user_data) +void onAddFileToPlaylist(GtkButton *button, gpointer user_data) { - GtkTreeView *treeview = NULL; + GtkTreeView *p_treeview = NULL; - treeview = (GtkTreeView *) lookup_widget( GTK_WIDGET(button), "tvFileList"); - if (treeview) + p_treeview = (GtkTreeView *) lookup_widget( GTK_WIDGET(button), "tvFileList"); + if (p_treeview) { - GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview); + GtkTreeSelection *p_selection = gtk_tree_view_get_selection(p_treeview); - gtk_tree_selection_selected_foreach(selection, (GtkTreeSelectionForeachFunc) &addSelectedToPlaylist, (gpointer) treeview); + gtk_tree_selection_selected_foreach(p_selection, (GtkTreeSelectionForeachFunc) &addSelectedToPlaylist, (gpointer) p_treeview); } } -void -NetworkBuildMRL (GtkEditable *editable, - gpointer user_data) +void NetworkBuildMRL(GtkEditable *editable, gpointer user_data) { intf_thread_t *p_intf = GtkGetIntf( GTK_WIDGET(editable) ); - GtkSpinButton *networkPort = NULL; - GtkEntry *entryMRL = NULL; - GtkEntry *networkType = NULL; - GtkEntry *networkAddress = NULL; - GtkEntry *networkProtocol = NULL; - const gchar *mrlNetworkType; - const gchar *mrlAddress; - const gchar *mrlProtocol; - gint mrlPort; + GtkSpinButton *p_networkPort = NULL; + GtkEntry *p_entryMRL = NULL; + GtkEntry *p_networkType = NULL; + GtkEntry *p_networkAddress = NULL; + GtkEntry *p_networkProtocol = NULL; + const gchar *psz_mrlNetworkType; + const gchar *psz_mrlAddress; + const gchar *psz_mrlProtocol; + gint i_mrlPort; char text[VLC_MAX_MRL]; - int pos = 0; + int i_pos = 0; - entryMRL = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryMRL" ); + p_entryMRL = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryMRL" ); - networkType = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryNetworkType" ); - networkAddress = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryNetworkAddress" ); - networkPort = (GtkSpinButton*) lookup_widget( GTK_WIDGET(editable), "entryNetworkPort" ); - networkProtocol = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryNetworkProtocolType" ); + p_networkType = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryNetworkType" ); + p_networkAddress = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryNetworkAddress" ); + p_networkPort = (GtkSpinButton*) lookup_widget( GTK_WIDGET(editable), "entryNetworkPort" ); + p_networkProtocol = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryNetworkProtocolType" ); - mrlNetworkType = gtk_entry_get_text(GTK_ENTRY(networkType)); - mrlAddress = gtk_entry_get_text(GTK_ENTRY(networkAddress)); - mrlPort = gtk_spin_button_get_value_as_int(networkPort); - mrlProtocol = gtk_entry_get_text(GTK_ENTRY(networkProtocol)); + psz_mrlNetworkType = gtk_entry_get_text(GTK_ENTRY(p_networkType)); + psz_mrlAddress = gtk_entry_get_text(GTK_ENTRY(p_networkAddress)); + i_mrlPort = gtk_spin_button_get_value_as_int(p_networkPort); + psz_mrlProtocol = gtk_entry_get_text(GTK_ENTRY(p_networkProtocol)); /* Build MRL from parts ;-) */ - pos = snprintf( &text[0], VLC_MAX_MRL, "%s://", (char*)mrlProtocol); - if (strncasecmp( (char*)mrlNetworkType, "multicast",9)==0) + i_pos = snprintf( &text[0], VLC_MAX_MRL, "%s://", (char*)psz_mrlProtocol); + if (strncasecmp( (char*)psz_mrlNetworkType, "multicast",9)==0) { - pos += snprintf( &text[pos], VLC_MAX_MRL - pos, "@" ); + i_pos += snprintf( &text[i_pos], VLC_MAX_MRL - i_pos, "@" ); } - pos += snprintf( &text[pos], VLC_MAX_MRL - pos, "%s:%d", (char*)mrlAddress, (int)mrlPort ); + i_pos += snprintf( &text[i_pos], VLC_MAX_MRL - i_pos, "%s:%d", (char*)psz_mrlAddress, (int)i_mrlPort ); - if (pos >= VLC_MAX_MRL) + if (i_pos >= VLC_MAX_MRL) { text[VLC_MAX_MRL-1]='\0'; msg_Err( p_intf, "Media Resource Locator is truncated to: %s", text); } - gtk_entry_set_text(entryMRL,text); + gtk_entry_set_text(p_entryMRL,text); } -void -onAddNetworkPlaylist (GtkButton *button, - gpointer user_data) +void onAddNetworkPlaylist(GtkButton *button, gpointer user_data) { - GtkEntry *p_mrl = NULL; - const gchar *mrl_name; + intf_thread_t *p_intf = GtkGetIntf( button ); + + GtkEntry *p_mrl = NULL; + GtkCheckButton *p_network_transcode = NULL; + gboolean b_network_transcode; + const gchar *psz_mrl_name; p_mrl = (GtkEntry*) lookup_widget(GTK_WIDGET(button),"entryMRL" ); - if (p_mrl) - { - mrl_name = gtk_entry_get_text(p_mrl); + psz_mrl_name = gtk_entry_get_text(p_mrl); - PlaylistAddItem(GTK_WIDGET(button), (gchar *)mrl_name); + p_network_transcode = (GtkCheckButton*) lookup_widget(GTK_WIDGET(button), "checkNetworkTranscode" ); + b_network_transcode = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(p_network_transcode)); + if (b_network_transcode) + { + msg_Dbg( p_intf, "Network transcode option selected." ); + onAddTranscodeToPlaylist(GTK_WIDGET(button), (gchar *)psz_mrl_name); + } + else + { + msg_Dbg( p_intf, "Network receiving selected." ); + PlaylistAddItem(GTK_WIDGET(button), (gchar *)psz_mrl_name, 0, 0); } } -void -onAddCameraToPlaylist (GtkButton *button, - gpointer user_data) +void onAddCameraToPlaylist(GtkButton *button, gpointer user_data) { intf_thread_t *p_intf = GtkGetIntf( button ); @@ -653,10 +638,36 @@ onAddCameraToPlaylist (GtkButton *button, gint i_v4l_decimation; /* end MJPEG only */ - char v4l_mrl[VLC_MAX_MRL]; - int pos; + GtkCheckButton *p_check_v4l_transcode = NULL; + gboolean b_v4l_transcode; + + char **ppsz_options = NULL; /* list of options */ + int i_options=0; + char v4l_mrl[6]; + int i_pos; + int i; + + ppsz_options = (char **) malloc(11 *sizeof(char*)); + if (ppsz_options == NULL) + { + msg_Err(p_intf, "No memory to allocate for v4l options."); + return; + } + for (i=0; i<11; i++) + { + ppsz_options[i] = (char *) malloc(VLC_MAX_MRL * sizeof(char)); + if (ppsz_options[i] == NULL) + { + msg_Err(p_intf, "No memory to allocate for v4l options string %i.", i); + for (i-=1; i>=0; i--) + free(ppsz_options[i]); + free(ppsz_options); + return; + } + } - pos = snprintf( &v4l_mrl[0], VLC_MAX_MRL, "v4l://"); + i_pos = snprintf( &v4l_mrl[0], 6, "v4l"); + v4l_mrl[5]='\0'; entryV4LChannel = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryV4LChannel" ); entryV4LFrequency = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryV4LFrequency" ); @@ -682,17 +693,27 @@ onAddCameraToPlaylist (GtkButton *button, p_v4l_size = gtk_entry_get_text(GTK_ENTRY(entryV4LSize)); p_v4l_sound_direction = gtk_entry_get_text(GTK_ENTRY(entryV4LSoundDirection)); - pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":%s", (char*)p_v4l_video_device ); - pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":adev=%s", (char*)p_v4l_audio_device ); - pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":norm=%s", (char*)p_v4l_norm ); - pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":size=%s", (char*)p_v4l_size ); - pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":%s", (char*)p_v4l_sound_direction ); - - pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":channel=%d", (int)i_v4l_channel ); - pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":frequency=%d", (int)i_v4l_frequency ); - pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":samplerate=%d", (int)i_v4l_samplerate ); - pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":quality=%d", (int)i_v4l_quality ); - pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":tuner=%d", (int)i_v4l_tuner ); + i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "%s", (char*)p_v4l_video_device ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "adev=%s", (char*)p_v4l_audio_device ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "norm=%s", (char*)p_v4l_norm ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "size=%s", (char*)p_v4l_size ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "%s", (char*)p_v4l_sound_direction ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + + i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "channel=%d", (int)i_v4l_channel ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "frequency=%d", (int)i_v4l_frequency ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "samplerate=%d", (int)i_v4l_samplerate ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "quality=%d", (int)i_v4l_quality ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "tuner=%d", (int)i_v4l_tuner ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; /* MJPEG only */ checkV4LMJPEG = (GtkCheckButton*) lookup_widget( GTK_WIDGET(button), "checkV4LMJPEG" ); @@ -701,57 +722,84 @@ onAddCameraToPlaylist (GtkButton *button, { entryV4LDecimation = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryV4LDecimation" ); i_v4l_decimation = gtk_spin_button_get_value_as_int(entryV4LDecimation); - pos += snprintf( &v4l_mrl[pos], VLC_MAX_MRL - pos, ":mjpeg:%d", (int)i_v4l_decimation ); + + i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "mjpeg:%d", (int)i_v4l_decimation ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; } /* end MJPEG only */ - if (pos >= VLC_MAX_MRL) + p_check_v4l_transcode = (GtkCheckButton*) lookup_widget(GTK_WIDGET(button), "checkV4LTranscode" ); + b_v4l_transcode = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(p_check_v4l_transcode)); + if (b_v4l_transcode) { - v4l_mrl[VLC_MAX_MRL-1]='\0'; - msg_Err(p_intf, "Media Resource Locator is truncated to: %s", v4l_mrl); + msg_Dbg( p_intf, "Camera transcode option selected." ); + onAddTranscodeToPlaylist(GTK_WIDGET(button), (gchar *)v4l_mrl); + } + else + { + msg_Dbg( p_intf, "Camera reception option selected." ); + PlaylistAddItem(GTK_WIDGET(button), (gchar*) &v4l_mrl, ppsz_options, i_options); } - - PlaylistAddItem(GTK_WIDGET(button), (gchar*) &v4l_mrl); } -gboolean -PlaylistEvent (GtkWidget *widget, - GdkEvent *event, - gpointer user_data) +gboolean PlaylistEvent(GtkWidget *widget, GdkEvent *event, gpointer user_data) { return FALSE; } -void -onPlaylistColumnsChanged (GtkTreeView *treeview, - gpointer user_data) +void onPlaylistColumnsChanged(GtkTreeView *treeview, gpointer user_data) { } -gboolean -onPlaylistRowSelected (GtkTreeView *treeview, - gboolean start_editing, - gpointer user_data) +gboolean onPlaylistRowSelected(GtkTreeView *treeview, gboolean start_editing, gpointer user_data) { return FALSE; } -void -onPlaylistRow (GtkTreeView *treeview, - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data) +void onPlaylistRow(GtkTreeView *treeview, GtkTreePath *path, + GtkTreeViewColumn *column, gpointer user_data) { + intf_thread_t *p_intf = GtkGetIntf( GTK_WIDGET(treeview) ); + GtkTreeSelection *p_selection = gtk_tree_view_get_selection(treeview); + playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + + if( p_playlist == NULL ) + { + return; // FALSE; + } + + if (gtk_tree_selection_count_selected_rows(p_selection) == 1) + { + GtkTreeModel *p_model; + GtkTreeIter iter; + int i_row; + + /* This might be a directory selection */ + p_model = gtk_tree_view_get_model(treeview); + if (!p_model) + { + msg_Err(p_intf, "PDA: Playlist model contains a NULL pointer\n" ); + return; + } + if (!gtk_tree_model_get_iter(p_model, &iter, path)) + { + msg_Err( p_intf, "PDA: Playlist could not get iter from model" ); + return; + } + + gtk_tree_model_get(p_model, &iter, 2, &i_row, -1); + playlist_Goto( p_playlist, i_row ); + } + vlc_object_release( p_playlist ); } -void -onUpdatePlaylist (GtkButton *button, - gpointer user_data) +void onUpdatePlaylist(GtkButton *button, gpointer user_data) { intf_thread_t * p_intf = GtkGetIntf( button ); playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, @@ -783,9 +831,12 @@ onUpdatePlaylist (GtkButton *button, vlc_object_release( p_playlist ); } -void -onDeletePlaylist (GtkButton *button, - gpointer user_data) +void deleteItemFromPlaylist(gpointer data, gpointer user_data) +{ + gtk_tree_path_free((GtkTreePath*) data); // removing an item. +} + +void onDeletePlaylist(GtkButton *button, gpointer user_data) { intf_thread_t *p_intf = GtkGetIntf( button ); playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, @@ -799,6 +850,7 @@ onDeletePlaylist (GtkButton *button, GList *p_rows = NULL; GList *p_node; GtkTreeModel *p_model = NULL; + GtkListStore *p_store = NULL; GtkTreeSelection *p_selection = gtk_tree_view_get_selection(p_tvplaylist); p_model = gtk_tree_view_get_model(p_tvplaylist); @@ -813,7 +865,7 @@ onDeletePlaylist (GtkButton *button, */ p_rows = g_list_reverse( p_rows ); } - + for (p_node=p_rows; p_node!=NULL; p_node = p_node->next) { GtkTreeIter iter; @@ -827,33 +879,34 @@ onDeletePlaylist (GtkButton *button, gint item; gtk_tree_model_get(p_model, &iter, 2, &item, -1); - playlist_Delete(p_playlist, item); + msg_Err( p_playlist, "PDA delete broken"); } } } - g_list_foreach (p_rows, gtk_tree_path_free, NULL); +#if 0 + g_list_foreach (p_rows, (GFunc*)gtk_tree_path_free, NULL); +#endif /* Testing the next line */ + g_list_foreach (p_rows, deleteItemFromPlaylist, NULL); g_list_free (p_rows); } /* Rebuild the playlist then. */ - p_model = gtk_list_store_new (3, + p_store = gtk_list_store_new (3, G_TYPE_STRING, /* Filename */ G_TYPE_STRING, /* Time */ G_TYPE_UINT); /* Hidden field */ - if (p_model) + if (p_store) { - PlaylistRebuildListStore(GTK_LIST_STORE(p_model), p_playlist); - gtk_tree_view_set_model(GTK_TREE_VIEW(p_tvplaylist), GTK_TREE_MODEL(p_model)); - g_object_unref(p_model); + PlaylistRebuildListStore(p_store, p_playlist); + gtk_tree_view_set_model(GTK_TREE_VIEW(p_tvplaylist), GTK_TREE_MODEL(p_store)); + g_object_unref(p_store); } } vlc_object_release( p_playlist ); } -void -onClearPlaylist (GtkButton *button, - gpointer user_data) +void onClearPlaylist(GtkButton *button, gpointer user_data) { intf_thread_t *p_intf = GtkGetIntf( button ); playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, @@ -868,7 +921,7 @@ onClearPlaylist (GtkButton *button, for(item = p_playlist->i_size - 1; item >= 0 ;item-- ) { - playlist_Delete( p_playlist, item); + msg_Err( p_playlist "fix pda delete"); } vlc_object_release( p_playlist ); @@ -887,9 +940,7 @@ onClearPlaylist (GtkButton *button, } -void -onPreferenceSave (GtkButton *button, - gpointer user_data) +void onPreferenceSave(GtkButton *button, gpointer user_data) { #if 0 intf_thread_t *p_intf = GtkGetIntf( button ); @@ -900,9 +951,7 @@ onPreferenceSave (GtkButton *button, } -void -onPreferenceApply (GtkButton *button, - gpointer user_data) +void onPreferenceApply(GtkButton *button, gpointer user_data) { #if 0 intf_thread_t *p_intf = GtkGetIntf( button ); @@ -912,9 +961,7 @@ onPreferenceApply (GtkButton *button, } -void -onPreferenceCancel (GtkButton *button, - gpointer user_data) +void onPreferenceCancel(GtkButton *button, gpointer user_data) { #if 0 intf_thread_t *p_intf = GtkGetIntf( button ); @@ -927,19 +974,17 @@ onPreferenceCancel (GtkButton *button, } -void -onAddTranscodeToPlaylist (GtkButton *button, - gpointer user_data) +void onAddTranscodeToPlaylist(GtkButton *button, gpointer user_data) { intf_thread_t *p_intf = GtkGetIntf( button ); - GtkEntry *entryVideoCodec = NULL; - GtkSpinButton *entryVideoBitrate = NULL; - GtkSpinButton *entryVideoBitrateTolerance = NULL; - GtkSpinButton *entryVideoKeyFrameInterval = NULL; - GtkCheckButton *checkVideoDeinterlace = NULL; - GtkEntry *entryAudioCodec = NULL; - GtkSpinButton *entryAudioBitrate = NULL; + GtkEntry *p_entryVideoCodec = NULL; + GtkSpinButton *p_entryVideoBitrate = NULL; + GtkSpinButton *p_entryVideoBitrateTolerance = NULL; + GtkSpinButton *p_entryVideoKeyFrameInterval = NULL; + GtkCheckButton *p_checkVideoDeinterlace = NULL; + GtkEntry *p_entryAudioCodec = NULL; + GtkSpinButton *p_entryAudioBitrate = NULL; const gchar *p_video_codec; gint i_video_bitrate; gint i_video_bitrate_tolerance; @@ -948,77 +993,175 @@ onAddTranscodeToPlaylist (GtkButton *button, const gchar *p_audio_codec; gint i_audio_bitrate; - GtkEntry *entryStdAccess = NULL; - GtkEntry *entryStdMuxer = NULL; - GtkEntry *entryStdURL = NULL; - GtkSpinButton *entryStdTTL = NULL; + GtkEntry *p_entryStdAccess = NULL; + GtkEntry *p_entryStdMuxer = NULL; + GtkEntry *p_entryStdURL = NULL; + GtkEntry *p_entryStdAnnounce = NULL; + GtkSpinButton *p_entryStdTTL = NULL; + GtkCheckButton *p_checkSAP = NULL; + GtkCheckButton *p_checkSLP = NULL; + const gchar *p_std_announce; const gchar *p_std_access; const gchar *p_std_muxer; const gchar *p_std_url; + gboolean b_sap_announce; + gboolean b_slp_announce; gint i_std_ttl; - gchar mrl[VLC_MAX_MRL]; - int pos; - - pos = snprintf( &mrl[0], VLC_MAX_MRL, "--sout '#transcode{"); - - entryVideoCodec = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryVideoCodec" ); - entryVideoBitrate = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryVideoBitrate" ); - entryVideoBitrateTolerance = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryVideoBitrateTolerance" ); - entryVideoKeyFrameInterval = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryVideoKeyFrameInterval" ); - - p_video_codec = gtk_entry_get_text(GTK_ENTRY(entryVideoCodec)); - i_video_bitrate = gtk_spin_button_get_value_as_int(entryVideoBitrate); - i_video_bitrate_tolerance = gtk_spin_button_get_value_as_int(entryVideoBitrateTolerance); - i_video_keyframe_interval = gtk_spin_button_get_value_as_int(entryVideoKeyFrameInterval); - - pos += snprintf( &mrl[pos], VLC_MAX_MRL - pos, "vcodec=%s,", (char*)p_video_codec ); - pos += snprintf( &mrl[pos], VLC_MAX_MRL - pos, "vb=%d,", (int)i_video_bitrate ); - pos += snprintf( &mrl[pos], VLC_MAX_MRL - pos, "vt=%d,", (int)i_video_bitrate_tolerance ); - pos += snprintf( &mrl[pos], VLC_MAX_MRL - pos, "keyint=%d,", (int)i_video_keyframe_interval ); - - checkVideoDeinterlace = (GtkCheckButton*) lookup_widget( GTK_WIDGET(button), "checkVideoDeinterlace" ); - b_video_deinterlace = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkVideoDeinterlace)); - if (b_video_deinterlace) + char **ppsz_options = NULL; /* list of options */ + int i_options=0; + int i; + + gchar mrl[7]; + int i_pos; + + ppsz_options = (char **) malloc(3 *sizeof(char*)); + if (ppsz_options == NULL) { - pos += snprintf( &mrl[pos], VLC_MAX_MRL - pos, "deinterlace," ); + msg_Err(p_intf, "No memory to allocate for v4l options."); + return; + } + for (i=0; i<3; i++) + { + ppsz_options[i] = (char *) malloc(VLC_MAX_MRL * sizeof(char)); + if (ppsz_options[i] == NULL) + { + msg_Err(p_intf, "No memory to allocate for v4l options string %i.", i); + for (i-=1; i>=0; i--) + free(ppsz_options[i]); + free(ppsz_options); + return; + } } - entryAudioCodec = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryAudioCodec" ); - entryAudioBitrate = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryAudioBitrate" ); - - p_audio_codec = gtk_entry_get_text(GTK_ENTRY(entryAudioCodec)); - i_audio_bitrate = gtk_spin_button_get_value_as_int(entryAudioBitrate); - pos += snprintf( &mrl[pos], VLC_MAX_MRL - pos, "acodec=%s,", (char*)p_audio_codec ); - pos += snprintf( &mrl[pos], VLC_MAX_MRL - pos, "ab=%d", (int)i_audio_bitrate ); + /* Update the playlist */ + playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + if( p_playlist == NULL ) return; + + /* Get all the options. */ + i_pos = snprintf( &mrl[0], VLC_MAX_MRL, "sout"); + mrl[6] = '\0'; + /* option 1 */ + i_pos = snprintf( &ppsz_options[i_options][0], VLC_MAX_MRL, "sout='#transcode{"); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + + p_entryVideoCodec = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryVideoCodec" ); + p_entryVideoBitrate = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryVideoBitrate" ); + p_entryVideoBitrateTolerance = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryVideoBitrateTolerance" ); + p_entryVideoKeyFrameInterval = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryVideoKeyFrameInterval" ); + + p_video_codec = gtk_entry_get_text(GTK_ENTRY(p_entryVideoCodec)); + i_video_bitrate = gtk_spin_button_get_value_as_int(p_entryVideoBitrate); + i_video_bitrate_tolerance = gtk_spin_button_get_value_as_int(p_entryVideoBitrateTolerance); + i_video_keyframe_interval = gtk_spin_button_get_value_as_int(p_entryVideoKeyFrameInterval); + + i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "vcodec=%s,", (char*)p_video_codec ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "vb=%d,", (int)i_video_bitrate ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "vt=%d,", (int)i_video_bitrate_tolerance ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "keyint=%d,", (int)i_video_keyframe_interval ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + + p_checkVideoDeinterlace = (GtkCheckButton*) lookup_widget( GTK_WIDGET(button), "checkVideoDeinterlace" ); + b_video_deinterlace = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(p_checkVideoDeinterlace)); + if (b_video_deinterlace) + { + i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "deinterlace," ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + } + p_entryAudioCodec = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryAudioCodec" ); + p_entryAudioBitrate = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryAudioBitrate" ); + + p_audio_codec = gtk_entry_get_text(GTK_ENTRY(p_entryAudioCodec)); + i_audio_bitrate = gtk_spin_button_get_value_as_int(p_entryAudioBitrate); + + i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "acodec=%s,", (char*)p_audio_codec ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "ab=%d,", (int)i_audio_bitrate ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "channels=1}"/*, (int)i_audio_channels*/ ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + + /* option 2 */ + i_pos = 0; + i_pos = snprintf( &ppsz_options[i_options++][i_pos], VLC_MAX_MRL - i_pos, "#" ); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + + p_entryStdAccess = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryStdAccess" ); + p_entryStdMuxer = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryStdMuxer" ); + p_entryStdURL = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryStdURL" ); + p_entryStdAnnounce = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryAnnounceChannel" ); + p_entryStdTTL = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryStdTTL" ); + + p_std_access = gtk_entry_get_text(GTK_ENTRY(p_entryStdAccess)); + p_std_muxer = gtk_entry_get_text(GTK_ENTRY(p_entryStdMuxer)); + p_std_url = gtk_entry_get_text(GTK_ENTRY(p_entryStdURL)); + p_std_announce = gtk_entry_get_text(GTK_ENTRY(p_entryStdAnnounce)); + b_sap_announce = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(p_checkSAP)); + b_slp_announce = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(p_checkSLP)); + + i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "std{access=%s,", (char*)p_std_access); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "mux=%s,", (char*)p_std_muxer); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "dst=%s", (char*)p_std_url); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + + if (strncasecmp( (const char*)p_std_access, "udp", 3)==0) + { + if (b_sap_announce) + { + i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "sap=%s", (char*)p_std_announce); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + } + if (b_slp_announce) + { + i_pos += snprintf( &ppsz_options[i_options][i_pos], VLC_MAX_MRL - i_pos, "slp=%s", (char*)p_std_announce); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; + } + } - pos += snprintf( &mrl[pos], VLC_MAX_MRL - pos, "}:std{" ); + i_std_ttl = gtk_spin_button_get_value_as_int(p_entryStdTTL); - entryStdAccess = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryStdAccess" ); - entryStdMuxer = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryStdMuxer" ); - entryStdURL = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryStdURL" ); - entryStdTTL = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryStdTTL" ); + i_pos += snprintf( &ppsz_options[i_options++][i_pos], VLC_MAX_MRL - i_pos, "ttl=%d}", (int)i_std_ttl); + if (i_pos>=VLC_MAX_MRL) ppsz_options[i_options][VLC_MAX_MRL-1] = '\0'; - p_std_access = gtk_entry_get_text(GTK_ENTRY(entryStdAccess)); - p_std_muxer = gtk_entry_get_text(GTK_ENTRY(entryStdMuxer)); - p_std_url = gtk_entry_get_text(GTK_ENTRY(entryStdURL)); + if (user_data != NULL) + { + msg_Dbg(p_intf, "Adding transcoding options to playlist item." ); + } + else + { + msg_Dbg(p_intf, "Adding --sout to playlist." ); + PlaylistAddItem(GTK_WIDGET(button), (gchar*) &mrl, ppsz_options, i_options); + } +} - pos += snprintf( &mrl[pos], VLC_MAX_MRL - pos, "access=%s,", (char*)p_std_access); - pos += snprintf( &mrl[pos], VLC_MAX_MRL - pos, "mux=%s,", (char*)p_std_muxer); - pos += snprintf( &mrl[pos], VLC_MAX_MRL - pos, "url=%s", (char*)p_std_url); - pos += snprintf( &mrl[pos], VLC_MAX_MRL - pos, "}'"); +void onEntryStdAccessChanged(GtkEditable *editable, gpointer user_data) +{ + intf_thread_t *p_intf = GtkGetIntf( editable ); - i_std_ttl = gtk_spin_button_get_value_as_int(entryStdTTL); + GtkCheckButton *p_checkSAP = NULL; + GtkCheckButton *p_checkSLP = NULL; + GtkEntry *p_entryStdAccess = NULL; + const gchar *p_std_access = NULL; + gboolean b_announce = FALSE; - pos += snprintf( &mrl[pos], VLC_MAX_MRL - pos, " --ttl=%d", (int)i_std_ttl); + p_entryStdAccess = (GtkEntry*) lookup_widget( GTK_WIDGET(editable), "entryStdAccess" ); + p_checkSAP = (GtkCheckButton*) lookup_widget( GTK_WIDGET(editable), "checkSAP" ); + p_checkSLP = (GtkCheckButton*) lookup_widget( GTK_WIDGET(editable), "checkSLP" ); - if (pos >= VLC_MAX_MRL) + if ( (p_std_access == NULL) || (p_checkSAP == NULL) || (p_checkSLP == NULL)) { - mrl[VLC_MAX_MRL-1]='\0'; - msg_Err(p_intf, "Media Resource Locator is truncated to: %s", mrl ); + msg_Err( p_intf, "Access, SAP and SLP widgets not found." ); + return; } + p_std_access = gtk_entry_get_text(GTK_ENTRY(p_entryStdAccess)); - PlaylistAddItem(GTK_WIDGET(button), (gchar*) &mrl); + b_announce = (strncasecmp( (const char*)p_std_access, "udp", 3) == 0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(p_checkSAP), b_announce); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(p_checkSLP), b_announce); } -