/*****************************************************************************
* pda_callbacks.c : Callbacks for the pda Linux Gtk+ plugin.
*****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
- * $Id: pda_callbacks.c,v 1.20 2003/11/30 21:21:20 jpsaman Exp $
+ * Copyright (C) 2000, 2001 the VideoLAN team
+ * $Id$
*
- * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
+ * Authors: Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
*
* 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
*
* 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 <sys/types.h> /* off_t */
-#include <stdlib.h>
#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/vout.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_vout.h>
-#include <stdio.h>
-#include <string.h>
#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
{
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 *)
GtkTreeIter p_play_iter;
p_play_model = gtk_tree_view_get_model(p_tvplaylist);
-
+
if (p_play_model)
{
int i;
else
#endif
{
- playlist_Add( p_playlist, (const char*)name, (const char**)ppsz_options, i_size,
- 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 */
vlc_mutex_lock( &p_playlist->object_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,
}
/* kludge */
for (i=0; i<n; i++)
- {
+ {
if ((pp_namelist[i]->d_name[0] != '.') &&
(lstat(pp_namelist[i]->d_name, &st)==0))
{
psz_perm[8]= 'w';
if (st.st_mode & S_IXOTH)
{
- // 'sticky' bit
+ /* 'sticky' bit */
if (st.st_mode &S_ISVTX)
psz_perm[9] = 't';
else
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)
{
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)
{
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 );
}
}
{
vlc_mutex_unlock( &p_playlist->object_lock );
playlist_Play( p_playlist );
+ gdk_window_lower( p_intf->p_sys->p_window->window );
}
else
{
}
}
-
void onStop(GtkButton *button, gpointer user_data)
{
intf_thread_t *p_intf = GtkGetIntf( GTK_WIDGET( button ) );
{
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)
{
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" );
}
}
{
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) );
}
}
-
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 );
return TRUE;
}
-
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 SliderMove(GtkRange *range, GtkScrollType scroll, gpointer user_data)
+{
+ intf_thread_t *p_intf = GtkGetIntf( range );
+ msg_Dbg( p_intf, "SliderButton Move" );
+}
+
+
void addSelectedToPlaylist(GtkTreeModel *model, GtkTreePath *path,
GtkTreeIter *iter, gpointer *userdata)
{
g_object_unref(p_store);
}
}
- else
- {
- gtk_tree_selection_selected_foreach(p_selection, (GtkTreeSelectionForeachFunc) &addSelectedToPlaylist, (gpointer) treeview);
- }
}
}
- else
- {
- gtk_tree_selection_selected_foreach(p_selection, (GtkTreeSelectionForeachFunc) &addSelectedToPlaylist, (gpointer) treeview);
- }
}
void onAddFileToPlaylist(GtkButton *button, gpointer user_data)
{
GtkTreeSelection *p_selection = gtk_tree_view_get_selection(p_treeview);
- gtk_tree_selection_selected_foreach(p_selection, (GtkTreeSelectionForeachFunc) &addSelectedToPlaylist, (gpointer) p_treeview);
+ gtk_tree_selection_selected_foreach(p_selection, (GtkTreeSelectionForeachFunc) &addSelectedToPlaylist, (gpointer) p_treeview);
}
}
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;
+ 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;
char text[VLC_MAX_MRL];
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" );
- psz_mrlNetworkType = gtk_entry_get_text(GTK_ENTRY(networkType));
- psz_mrlAddress = gtk_entry_get_text(GTK_ENTRY(networkAddress));
- i_mrlPort = gtk_spin_button_get_value_as_int(networkPort);
- psz_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 ;-) */
i_pos = snprintf( &text[0], VLC_MAX_MRL, "%s://", (char*)psz_mrlProtocol);
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 *psz_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)
- {
- psz_mrl_name = gtk_entry_get_text(p_mrl);
+ psz_mrl_name = gtk_entry_get_text(p_mrl);
+ 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 );
gint i_v4l_decimation;
/* end MJPEG only */
+ 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];
}
i_pos = snprintf( &v4l_mrl[0], 6, "v4l");
- v4l_mrl[5]='\0';
+ v4l_mrl[5]='\0';
entryV4LChannel = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryV4LChannel" );
entryV4LFrequency = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryV4LFrequency" );
}
/* end MJPEG only */
- PlaylistAddItem(GTK_WIDGET(button), (gchar*) &v4l_mrl, ppsz_options, i_options);
+ 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)
+ {
+ 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);
+ }
}
-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,
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,
*/
p_rows = g_list_reverse( p_rows );
}
-
+
for (p_node=p_rows; p_node!=NULL; p_node = p_node->next)
{
GtkTreeIter iter;
gint item;
gtk_tree_model_get(p_model, &iter, 2, &item, -1);
- playlist_Delete(p_playlist, item);
+ msg_Err( p_playlist, "PDA delete broken");
}
}
}
+#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);
}
}
-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,
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 );
}
-void
-onPreferenceSave (GtkButton *button,
- gpointer user_data)
+void onPreferenceSave(GtkButton *button, gpointer user_data)
{
#if 0
intf_thread_t *p_intf = GtkGetIntf( button );
}
-void
-onPreferenceApply (GtkButton *button,
- gpointer user_data)
+void onPreferenceApply(GtkButton *button, gpointer user_data)
{
#if 0
intf_thread_t *p_intf = GtkGetIntf( button );
}
-void
-onPreferenceCancel (GtkButton *button,
- gpointer user_data)
+void onPreferenceCancel(GtkButton *button, gpointer user_data)
{
#if 0
intf_thread_t *p_intf = GtkGetIntf( button );
}
-void onAddTranscodeToPlaylist (GtkButton *button,
- gpointer user_data)
+void onAddTranscodeToPlaylist(GtkButton *button, gpointer user_data)
{
intf_thread_t *p_intf = GtkGetIntf( button );
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;
char **ppsz_options = NULL; /* list of options */
gchar mrl[7];
int i_pos;
- ppsz_options = (char **) malloc(15 *sizeof(char*));
+ ppsz_options = (char **) malloc(3 *sizeof(char*));
if (ppsz_options == NULL)
{
msg_Err(p_intf, "No memory to allocate for v4l options.");
return;
}
- for (i=0; i<15; i++)
+ for (i=0; i<3; i++)
{
ppsz_options[i] = (char *) malloc(VLC_MAX_MRL * sizeof(char));
if (ppsz_options[i] == NULL)
}
}
+ /* 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';
-
- i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "'#transcode{");
+ /* 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++][0], VLC_MAX_MRL, "vcodec=%s,", (char*)p_video_codec );
+
+ 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++][0], VLC_MAX_MRL, "vb=%d,", (int)i_video_bitrate );
+ 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++][0], VLC_MAX_MRL, "vt=%d,", (int)i_video_bitrate_tolerance );
+ 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++][0], VLC_MAX_MRL, "keyint=%d,", (int)i_video_keyframe_interval );
+ 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++][0], VLC_MAX_MRL, "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_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++][0], VLC_MAX_MRL, "acodec=%s,", (char*)p_audio_codec );
+ 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++][0], VLC_MAX_MRL, "ab=%d", (int)i_audio_bitrate );
+ 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';
- i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "}:std{" );
+ /* 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++][0], VLC_MAX_MRL, "access=%s,", (char*)p_std_access);
+ 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++][0], VLC_MAX_MRL, "mux=%s,", (char*)p_std_muxer);
+ 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++][0], VLC_MAX_MRL, "url=%s}'", (char*)p_std_url);
+ 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';
-// i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "}'");
-// 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';
+ }
+ }
i_std_ttl = gtk_spin_button_get_value_as_int(p_entryStdTTL);
- i_pos = snprintf( &ppsz_options[i_options++][0], VLC_MAX_MRL, "ttl=%d", (int)i_std_ttl);
+ 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';
- PlaylistAddItem(GTK_WIDGET(button), (gchar*) &mrl, ppsz_options, i_options);
+ 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);
+ }
}
+void onEntryStdAccessChanged(GtkEditable *editable, gpointer user_data)
+{
+ intf_thread_t *p_intf = GtkGetIntf( editable );
+
+ GtkCheckButton *p_checkSAP = NULL;
+ GtkCheckButton *p_checkSLP = NULL;
+ GtkEntry *p_entryStdAccess = NULL;
+ const gchar *p_std_access = NULL;
+ gboolean b_announce = FALSE;
+
+ 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 ( (p_std_access == NULL) || (p_checkSAP == NULL) || (p_checkSLP == NULL))
+ {
+ msg_Err( p_intf, "Access, SAP and SLP widgets not found." );
+ return;
+ }
+ p_std_access = gtk_entry_get_text(GTK_ENTRY(p_entryStdAccess));
+
+ 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);
+}
projects / vlc / blobdiff