Skip to content

V
vlc
Commit cf3c9805 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* ALL: removed the old channels server stuff (was deprecated).
parent ad3713cb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 1671 deletions
Makefile.am
View file @ cf3c9805
......@@ -187,7 +187,6 @@ HEADERS_include = \
include/modules.h \
include/modules_inner.h \
include/mtime.h \
include/netutils.h \
include/network.h \
include/os_specific.h \
include/stream_control.h \
......@@ -406,7 +405,6 @@ SOURCES_libvlc_common = \
src/misc/threads.c \
src/misc/cpu.c \
src/misc/configuration.c \
src/misc/netutils.c \
src/misc/iso_lang.c \
src/misc/iso-639_def.h \
src/misc/messages.c \
......
include/netutils.h deleted 100644 → 0
View file @ ad3713cb
/*****************************************************************************
* netutils.h: various network functions
* This header describes miscellanous utility functions shared between several
* modules.
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: netutils.h,v 1.22 2002/07/31 20:56:50 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Henri Fallon <henri@videolan.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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.
*****************************************************************************/
/* The channel without stream is 0 */
#define COMMON_CHANNEL 0
/*****************************************************************************
* Prototypes
*****************************************************************************/
struct sockaddr_in;
int network_BuildAddr ( struct sockaddr_in *, char *, int );
#define network_ChannelJoin(a,b) __network_ChannelJoin(VLC_OBJECT(a),b)
#define network_ChannelCreate(a) __network_ChannelCreate(VLC_OBJECT(a))
VLC_EXPORT( int, __network_ChannelJoin, ( vlc_object_t *, int ) );
VLC_EXPORT( int, __network_ChannelCreate, ( vlc_object_t * ) );
modules/gui/familiar/interface.c
View file @ cf3c9805
......@@ -391,7 +391,7 @@ create_familiar (void)
gtk_widget_show (vbox3);
gtk_container_add (GTK_CONTAINER (mediabook), vbox3);
network_multicast = gtk_radio_button_new_with_label (network_group, _("UDP/RTP (Address when Multicast)"));
network_multicast = gtk_radio_button_new_with_label (network_group, _("UDP/RTP (Adress when Multicast)"));
network_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_multicast));
gtk_widget_set_name (network_multicast, "network_multicast");
gtk_widget_ref (network_multicast);
......
modules/gui/gtk/display.c
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* display.c: Gtk+ tools for main interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: display.c,v 1.9 2003/02/05 22:11:52 sam Exp $
* $Id: display.c,v 1.10 2003/05/05 16:09:39 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -86,7 +86,6 @@ gint E_(GtkModeManage)( intf_thread_t * p_intf )
GtkWidget * p_network_box;
GtkWidget * p_slider;
GtkWidget * p_label;
GtkWidget * p_channel;
vlc_bool_t b_control;
#define GETWIDGET( ptr, name ) GTK_WIDGET( gtk_object_get_data( GTK_OBJECT( \
......@@ -135,17 +134,6 @@ gint E_(GtkModeManage)( intf_thread_t * p_intf )
"network_address_label" );
gtk_label_set_text( GTK_LABEL( p_label ),
p_intf->p_sys->p_input->psz_source );
p_channel = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
p_intf->p_sys->p_window ), "network_channel_box" ) );
if( config_GetInt( p_intf, "network-channel" ) )
{
gtk_widget_show( GTK_WIDGET( p_channel ) );
}
else
{
gtk_widget_hide( GTK_WIDGET( p_channel ) );
}
break;
default:
msg_Warn( p_intf, "cannot determine input method" );
......@@ -185,23 +173,12 @@ gint E_(GtkModeManage)( intf_thread_t * p_intf )
msg_Dbg( p_intf, "stream has changed, refreshing interface" );
}
else
{
if( config_GetInt( p_intf, "network-channel" ) )
{
gtk_widget_show( GTK_WIDGET( p_network_box ) );
p_channel = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
p_intf->p_sys->p_window ), "network_channel_box" ) );
gtk_widget_show( GTK_WIDGET( p_channel ) );
}
else
{
/* default mode */
p_label = gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_window ), "label_status" );
gtk_label_set_text( GTK_LABEL( p_label ), "" );
gtk_widget_show( GTK_WIDGET( p_file_box ) );
}
/* unsensitize menus */
gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_program"),
......
modules/gui/gtk/gnome.glade
View file @ cf3c9805
......@@ -1012,81 +1012,6 @@
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkHBox</class>
<name>network_channel_box</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<widget>
<class>GtkLabel</class>
<name>label_network</name>
<label>Network Channel:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>5</padding>
<expand>True</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkSpinButton</class>
<name>network_channel_spinbutton</name>
<can_focus>True</can_focus>
<signal>
<name>activate</name>
<handler>GtkNetworkJoin</handler>
<last_modification_time>Wed, 30 May 2001 02:28:48 GMT</last_modification_time>
</signal>
<climb_rate>1</climb_rate>
<digits>0</digits>
<numeric>False</numeric>
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>0</value>
<lower>0</lower>
<upper>100</upper>
<step>1</step>
<page>10</page>
<page_size>10</page_size>
<child>
<padding>5</padding>
<expand>False</expand>
<fill>True</fill>
</child>
</widget>
<widget>
<class>GtkButton</class>
<name>network_channel_go_button</name>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>GtkChannelGo</handler>
<last_modification_time>Wed, 30 May 2001 02:38:25 GMT</last_modification_time>
</signal>
<label>Go!</label>
<relief>GTK_RELIEF_NONE</relief>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
</widget>
</widget>
</widget>
......@@ -2155,7 +2080,7 @@ http://www.videolan.org/
<class>GtkTable</class>
<name>table4</name>
<border_width>5</border_width>
<rows>4</rows>
<rows>3</rows>
<columns>6</columns>
<homogeneous>False</homogeneous>
<row_spacing>5</row_spacing>
......@@ -2217,34 +2142,6 @@ http://www.videolan.org/
</child>
</widget>
<widget>
<class>GtkRadioButton</class>
<name>network_channel</name>
<can_focus>True</can_focus>
<signal>
<name>toggled</name>
<handler>GtkNetworkOpenChannel</handler>
<last_modification_time>Thu, 16 May 2002 01:44:15 GMT</last_modification_time>
</signal>
<label>Channel server</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkRadioButton</class>
<name>network_http</name>
......@@ -2260,8 +2157,8 @@ http://www.videolan.org/
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
......@@ -2326,33 +2223,6 @@ http://www.videolan.org/
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>network_channel_address_label</name>
<sensitive>False</sensitive>
<label>Address</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>network_http_url_label</name>
......@@ -2367,8 +2237,8 @@ http://www.videolan.org/
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
......@@ -2422,48 +2292,6 @@ http://www.videolan.org/
</widget>
</widget>
<widget>
<class>GtkCombo</class>
<name>network_channel_address_combo</name>
<sensitive>False</sensitive>
<value_in_list>False</value_in_list>
<ok_if_empty>True</ok_if_empty>
<case_sensitive>False</case_sensitive>
<use_arrows>True</use_arrows>
<use_arrows_always>False</use_arrows_always>
<items></items>
<child>
<left_attach>2</left_attach>
<right_attach>4</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<widget>
<class>GtkEntry</class>
<child_name>GtkCombo:entry</child_name>
<name>network_channel_address</name>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 09 Jul 2002 13:57:16 GMT</last_modification_time>
</signal>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
</widget>
</widget>
<widget>
<class>GtkLabel</class>
<name>network_multicast_port_label</name>
......@@ -2491,33 +2319,6 @@ http://www.videolan.org/
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>network_channel_port_label</name>
<sensitive>False</sensitive>
<label>Port</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>4</left_attach>
<right_attach>5</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkSpinButton</class>
<name>network_multicast_port</name>
......@@ -2557,45 +2358,6 @@ http://www.videolan.org/
</child>
</widget>
<widget>
<class>GtkSpinButton</class>
<name>network_channel_port</name>
<width>75</width>
<sensitive>False</sensitive>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 09 Jul 2002 13:57:45 GMT</last_modification_time>
</signal>
<climb_rate>1</climb_rate>
<digits>0</digits>
<numeric>False</numeric>
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>6010</value>
<lower>0</lower>
<upper>65535</upper>
<step>1</step>
<page>10</page>
<page_size>10</page_size>
<child>
<left_attach>5</left_attach>
<right_attach>6</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>network_http_url</name>
......@@ -2613,8 +2375,8 @@ http://www.videolan.org/
<child>
<left_attach>2</left_attach>
<right_attach>6</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
......
modules/gui/gtk/gnome_interface.c
View file @ cf3c9805
This diff is collapsed.
modules/gui/gtk/gtk.glade
View file @ cf3c9805
......@@ -1014,81 +1014,6 @@
<fill>True</fill>
</child>
</widget>
<widget>
<class>GtkHBox</class>
<name>network_channel_box</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>False</fill>
</child>
<widget>
<class>GtkLabel</class>
<name>channel_label</name>
<label>Channel:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>5</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkSpinButton</class>
<name>network_channel_spinbutton</name>
<can_focus>True</can_focus>
<signal>
<name>activate</name>
<handler>GtkNetworkJoin</handler>
<last_modification_time>Wed, 30 May 2001 02:48:10 GMT</last_modification_time>
</signal>
<climb_rate>1</climb_rate>
<digits>0</digits>
<numeric>False</numeric>
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>0</value>
<lower>0</lower>
<upper>100</upper>
<step>1</step>
<page>10</page>
<page_size>10</page_size>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
</child>
</widget>
<widget>
<class>GtkButton</class>
<name>network_channel_go_button</name>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>GtkChannelGo</handler>
<last_modification_time>Wed, 30 May 2001 02:49:18 GMT</last_modification_time>
</signal>
<label>Go!</label>
<relief>GTK_RELIEF_NONE</relief>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
</widget>
<widget>
......@@ -2339,7 +2264,7 @@
<class>GtkTable</class>
<name>table4</name>
<border_width>5</border_width>
<rows>4</rows>
<rows>3</rows>
<columns>6</columns>
<homogeneous>False</homogeneous>
<row_spacing>5</row_spacing>
......@@ -2401,34 +2326,6 @@
</child>
</widget>
<widget>
<class>GtkRadioButton</class>
<name>network_channel</name>
<can_focus>True</can_focus>
<signal>
<name>toggled</name>
<handler>GtkNetworkOpenChannel</handler>
<last_modification_time>Thu, 16 May 2002 01:44:15 GMT</last_modification_time>
</signal>
<label>Channel server</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkRadioButton</class>
<name>network_http</name>
......@@ -2444,8 +2341,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
......@@ -2510,33 +2407,6 @@
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>network_channel_address_label</name>
<sensitive>False</sensitive>
<label>Address</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>network_http_url_label</name>
......@@ -2551,8 +2421,8 @@
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
......@@ -2606,48 +2476,6 @@
</widget>
</widget>
<widget>
<class>GtkCombo</class>
<name>network_channel_address_combo</name>
<sensitive>False</sensitive>
<value_in_list>False</value_in_list>
<ok_if_empty>True</ok_if_empty>
<case_sensitive>False</case_sensitive>
<use_arrows>True</use_arrows>
<use_arrows_always>False</use_arrows_always>
<items></items>
<child>
<left_attach>2</left_attach>
<right_attach>4</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<widget>
<class>GtkEntry</class>
<child_name>GtkCombo:entry</child_name>
<name>network_channel_address</name>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 09 Jul 2002 13:57:16 GMT</last_modification_time>
</signal>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
</widget>
</widget>
<widget>
<class>GtkLabel</class>
<name>network_multicast_port_label</name>
......@@ -2675,33 +2503,6 @@
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>network_channel_port_label</name>
<sensitive>False</sensitive>
<label>Port</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>4</left_attach>
<right_attach>5</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkSpinButton</class>
<name>network_multicast_port</name>
......@@ -2741,45 +2542,6 @@
</child>
</widget>
<widget>
<class>GtkSpinButton</class>
<name>network_channel_port</name>
<width>75</width>
<sensitive>False</sensitive>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 09 Jul 2002 13:57:45 GMT</last_modification_time>
</signal>
<climb_rate>1</climb_rate>
<digits>0</digits>
<numeric>False</numeric>
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>6010</value>
<lower>0</lower>
<upper>65535</upper>
<step>1</step>
<page>10</page>
<page_size>10</page_size>
<child>
<left_attach>5</left_attach>
<right_attach>6</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>network_http_url</name>
......@@ -2797,8 +2559,8 @@
<child>
<left_attach>2</left_attach>
<right_attach>6</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
......
modules/gui/gtk/gtk_callbacks.c
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* gtk_callbacks.c : Callbacks for the Gtk+ plugin.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: gtk_callbacks.c,v 1.13 2003/02/09 01:56:21 massiot Exp $
* $Id: gtk_callbacks.c,v 1.14 2003/05/05 16:09:39 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -46,8 +46,6 @@
#include "common.h"
#include "netutils.h"
/*****************************************************************************
* Useful function to retrieve p_intf
****************************************************************************/
......@@ -324,44 +322,6 @@ void GtkChapterNext( GtkButton * button, gpointer user_data )
vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
}
/****************************************************************************
* Network specific items
****************************************************************************/
void GtkNetworkJoin( GtkEditable * editable, gpointer user_data )
{
int i_channel;
i_channel = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( editable ) );
#if 0
msg_Dbg( "intf info: joining channel %d", i_channel );
network_ChannelJoin( i_channel );
#endif
}
void GtkChannelGo( GtkButton * button, gpointer user_data )
{
GtkWidget * window;
GtkWidget * spin;
int i_channel;
intf_thread_t *p_intf = GtkGetIntf( button );
window = gtk_widget_get_toplevel( GTK_WIDGET (button) );
spin = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT( window ),
"network_channel_spinbutton" ) );
i_channel = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spin ) );
msg_Dbg( p_intf, "joining channel %d", i_channel );
vlc_mutex_lock( &p_intf->change_lock );
network_ChannelJoin( p_intf, i_channel );
vlc_mutex_unlock( &p_intf->change_lock );
/* input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY ); */
}
/****************************************************************************
* About box
****************************************************************************/
......
modules/gui/gtk/gtk_callbacks.h
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* gtk_callbacks.h : Callbacks for the gtk plugin.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: gtk_callbacks.h,v 1.5 2003/01/26 14:49:09 fenrir Exp $
* $Id: gtk_callbacks.h,v 1.6 2003/05/05 16:09:39 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -66,9 +66,6 @@ void GtkWindowDrag ( GtkWidget *, GdkDragContext *,
void GtkJumpOk ( GtkButton * button, gpointer );
void GtkJumpCancel ( GtkButton * button, gpointer user_data );
void GtkNetworkJoin ( GtkEditable *, gpointer );
void GtkChannelGo ( GtkButton *, gpointer );
void GtkNetworkOpenChannel ( GtkToggleButton *, gpointer );
gboolean
......
modules/gui/gtk/gtk_interface.c
View file @ cf3c9805
This diff is collapsed.
modules/gui/gtk/open.c
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* gtk_open.c : functions to handle file/disc/network open widgets.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: open.c,v 1.13 2003/01/29 18:10:52 sam Exp $
* $Id: open.c,v 1.14 2003/05/05 16:09:39 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -46,8 +46,6 @@
#include "playlist.h"
#include "common.h"
#include "netutils.h"
static void GtkOpenShow( intf_thread_t *, int );
static void GtkFileOpenChanged ( GtkWidget *, gpointer );
......@@ -248,16 +246,9 @@ gboolean GtkNetworkOpenShow( GtkWidget *widget,
static void GtkNetworkOpenChanged( GtkWidget *button, gpointer user_data )
{
intf_thread_t * p_intf = GtkGetIntf( button );
GString * p_target = g_string_new( "" );
unsigned int i_port;
vlc_bool_t b_channel;
/* Manage channel server */
b_channel = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(
lookup_widget( GTK_WIDGET(button), "network_channel" ) ) );
config_PutInt( p_intf, "network-channel", b_channel );
#define SELECTED( s ) GTK_TOGGLE_BUTTON( lookup_widget( GTK_WIDGET(button), \
(s) ) )->active
......@@ -287,30 +278,6 @@ static void GtkNetworkOpenChanged( GtkWidget *button, gpointer user_data )
g_string_sprintfa( p_target, ":%i", i_port );
}
}
else if( SELECTED( "network_channel" ) )
{
char * psz_channel;
unsigned int i_channel_port;
if( p_intf->p_vlc->p_channel == NULL )
{
network_ChannelCreate( p_intf );
}
psz_channel = gtk_entry_get_text( GTK_ENTRY( lookup_widget(
GTK_WIDGET(button), "network_channel_address" ) ) );
i_channel_port = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(
lookup_widget( GTK_WIDGET(button), "network_channel_port" ) ) );
config_PutPsz( p_intf, "channel-server", psz_channel );
if( i_channel_port < 65536 )
{
config_PutInt( p_intf, "channel-port", i_channel_port );
}
/* FIXME: we should use a playlist server instead */
g_string_append( p_target, "udp://" );
}
else if( SELECTED( "network_http" ) )
{
g_string_assign( p_target,
......@@ -364,30 +331,6 @@ void GtkNetworkOpenMulticast( GtkToggleButton *togglebutton,
GtkNetworkOpenChanged( GTK_WIDGET( togglebutton ), user_data );
}
void GtkNetworkOpenChannel( GtkToggleButton *togglebutton,
gpointer user_data )
{
GtkWidget * p_open;
p_open = gtk_widget_get_toplevel( GTK_WIDGET (togglebutton) );
gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_open ),
"network_channel_address_label" ),
gtk_toggle_button_get_active( togglebutton ) );
gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_open ),
"network_channel_address_combo" ),
gtk_toggle_button_get_active( togglebutton ) );
gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_open ),
"network_channel_port_label" ),
gtk_toggle_button_get_active( togglebutton ) );
gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_open ),
"network_channel_port" ),
gtk_toggle_button_get_active( togglebutton ) );
GtkNetworkOpenChanged( GTK_WIDGET( togglebutton ), user_data );
}
void GtkNetworkOpenHTTP( GtkToggleButton *togglebutton,
gpointer user_data )
{
......@@ -537,27 +480,10 @@ static void GtkOpenShow( intf_thread_t *p_intf, int i_page )
GTK_OBJECT( p_intf->p_sys->p_open ), "network_udp_port" ) ),
config_GetInt( p_intf, "server-port" ) );
psz_var = config_GetPsz( p_intf, "channel-server" );
if( psz_var )
{
gtk_entry_set_text( GTK_ENTRY( gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_open ), "network_channel_address" ) ),
psz_var );
free( psz_var );
}
gtk_entry_set_text( GTK_ENTRY( gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_open ), "network_http_url" ) ),
"http://" );
gtk_spin_button_set_value( GTK_SPIN_BUTTON( gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_open ), "network_channel_port" ) ),
config_GetInt( p_intf, "channel-port" ) );
gtk_toggle_button_set_active( gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_open ), "network_channel" ),
config_GetInt( p_intf, "network-channel" ) );
/* Satellite stuff */
psz_var = config_GetPsz( p_intf, "frequency" );
if( psz_var )
......@@ -669,35 +595,6 @@ void GtkOpenOk( GtkButton * button, gpointer user_data )
{
config_PutPsz( p_intf, "sout", "" );
}
/* Enable the channel box when network channel is selected */
if( GTK_TOGGLE_BUTTON( lookup_widget( GTK_WIDGET(button),
"network_channel" ) )->active )
{
GtkWidget * p_network_box;
GtkWidget * p_channel;
GtkWidget * p_label;
p_network_box = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
p_intf->p_sys->p_window ), "network_box" ) );
gtk_widget_show( GTK_WIDGET( p_network_box ) );
p_label = gtk_object_get_data( GTK_OBJECT(
p_intf->p_sys->p_window ),
"label_status" );
gtk_widget_hide( GTK_WIDGET( p_label ) );
p_channel = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
p_intf->p_sys->p_window ), "network_channel_box" ) );
if( config_GetInt( p_intf, "network-channel" ) )
{
gtk_widget_show( GTK_WIDGET( p_channel ) );
}
else
{
gtk_widget_hide( GTK_WIDGET( p_channel ) );
}
}
}
void GtkOpenCancel( GtkButton * button, gpointer user_data )
......
modules/gui/gtk/sout.c
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* sout.c :
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: sout.c,v 1.1 2003/01/26 14:49:09 fenrir Exp $
* $Id: sout.c,v 1.2 2003/05/05 16:09:39 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -45,8 +45,6 @@
#include "playlist.h"
#include "common.h"
#include "netutils.h"
void GtkSoutSettings ( GtkButton *button,
gpointer user_data );
......
modules/gui/macosx/open.m
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* open.m: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: open.m,v 1.30 2003/04/30 23:58:56 hartman Exp $
* $Id: open.m,v 1.31 2003/05/05 16:09:39 gbazin Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -41,8 +41,6 @@
#include "playlist.h"
#include "open.h"
#include "netutils.h"
/*****************************************************************************
* GetEjectableMediaOfClass
*****************************************************************************/
......
modules/gui/qnx/vout.c
View file @ cf3c9805
......@@ -383,10 +383,6 @@ static int QNXManage( vout_thread_t *p_vout )
break;
default:
if( i_key >= Pk_0 && i_key <= Pk_9 )
{
// network_ChannelJoin( i_key );
}
break;
}
}
......
modules/gui/skins/src/event.cpp
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* event.cpp: Event class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: event.cpp,v 1.13 2003/04/21 21:51:16 asmax Exp $
* $Id: event.cpp,v 1.14 2003/05/05 16:09:40 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -78,11 +78,6 @@ void Event::DestructParameters( bool force )
case CTRL_SET_TEXT:
delete[] (char *)Param2;
break;
case VLC_NET_ADDCS:
if( Param2 == (int)true || force )
delete[] (char *)Param1;
break;
}
}
......@@ -180,8 +175,6 @@ unsigned int Event::GetMessageType( string Desc )
// Network events
else if( Desc == "VLC_NET_ADDUDP" )
return VLC_NET_ADDUDP;
else if( Desc == "VLC_NET_ADDCS" )
return VLC_NET_ADDCS;
// Window event
else if( Desc == "WINDOW_MOVE" )
......@@ -296,13 +289,6 @@ void Event::CreateEvent()
Param2 = atoi( para1 );
break;
case VLC_NET_ADDCS:
buf = new char[MAX_PARAM_SIZE + 7];
sprintf( buf, "%s:%s", para1, para2 );
Param1 = (unsigned int)buf;
Param2 = (int)false;
break;
case CTRL_ID_VISIBLE:
Param1 = (unsigned int)FindControl( para1 );
Param2 = GetBool( para2 );
......
modules/gui/skins/src/event.h
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* event.h: Event class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: event.h,v 1.8 2003/04/21 22:12:37 asmax Exp $
* $Id: event.h,v 1.9 2003/05/05 16:09:40 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -96,7 +96,6 @@ using namespace std;
// Network events
#define VLC_NET_ADDUDP (VLC_MESSAGE + 701)
#define VLC_NET_ADDCS (VLC_MESSAGE + 703)
// Window event
#define WINDOW_MOVE (VLC_WINDOW + 1)
......
modules/gui/skins/src/vlcproc.cpp
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* vlcproc.cpp: VlcProc class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: vlcproc.cpp,v 1.19 2003/05/05 12:15:25 gbazin Exp $
* $Id: vlcproc.cpp,v 1.20 2003/05/05 16:09:40 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -39,10 +39,6 @@
#include <wx/wx.h>
#endif
extern "C" {
#include "netutils.h"
}
//--- SKIN ------------------------------------------------------------------
#include "../os_api.h"
#include "event.h"
......@@ -183,10 +179,6 @@ bool VlcProc::EventProc( Event *evt )
AddNetworkUDP( (int)evt->GetParam2() );
return true;
case VLC_NET_ADDCS:
AddNetworkChannelServer( (char *)evt->GetParam1() );
return true;
default:
return true;
}
......
modules/gui/win32/mainframe.cpp
View file @ cf3c9805
......@@ -42,8 +42,6 @@
#include "misc.h"
#include "win32_common.h"
#include "netutils.h"
/*****************************************************************************
* BORLAND SUCKS
* If the following pragma doesn't end with \r\n instead of \n, the file
......@@ -563,16 +561,7 @@ void __fastcall TMainFrameDlg::NextChapterActionExecute( TObject *Sender )
****************************************************************************/
void __fastcall TMainFrameDlg::ButtonGoClick( TObject *Sender )
{
int i_channel;
i_channel = SpinEditChannel->Value;
msg_Dbg( p_intf, "joining channel %d", i_channel );
vlc_mutex_lock( &p_intf->change_lock );
network_ChannelJoin( p_intf, i_channel );
vlc_mutex_unlock( &p_intf->change_lock );
// input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
msg_Err( p_intf, "Deprecated, doesn't do anything" );
}
//---------------------------------------------------------------------------
......
modules/gui/win32/network.cpp
View file @ cf3c9805
......@@ -30,8 +30,6 @@
#include "misc.h"
#include "win32_common.h"
#include "netutils.h"
//---------------------------------------------------------------------------
//#pragma package(smart_init)
#pragma link "CSPIN"
......@@ -124,20 +122,6 @@ void __fastcall TNetworkDlg::ButtonOkClick( TObject *Sender )
| ( p_intf->p_sys->b_play_when_adding ? PLAYLIST_GO : 0 )
, PLAYLIST_END );
/* Channel server */
case 2:
config_PutInt( p_intf, "network-channel", TRUE );
config_PutPsz( p_intf, "channel-server", Channel.c_str() );
config_PutInt( p_intf, "channel-port", i_channel_port );
if( p_intf->p_vlc->p_channel == NULL )
{
network_ChannelCreate( p_intf );
}
p_intf->p_sys->b_playing = 1;
break;
/* HTTP */
case 3:
config_PutInt( p_intf, "network-channel", FALSE );
......
modules/video_output/directx/directx.c
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* vout.c: Windows DirectX video output display method
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: directx.c,v 1.17 2003/04/29 16:03:14 gbazin Exp $
* $Id: directx.c,v 1.18 2003/05/05 16:09:37 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -45,8 +45,6 @@
#include <windows.h>
#include <ddraw.h>
#include "netutils.h"
#include "vout.h"
/*****************************************************************************
......
modules/video_output/directx/events.c
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* events.c: Windows DirectX video output events handler
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: events.c,v 1.12 2003/03/04 22:48:55 gbazin Exp $
* $Id: events.c,v 1.13 2003/05/05 16:09:37 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -35,8 +35,6 @@
#include <vlc/input.h>
#include <vlc/vout.h>
#include "netutils.h"
#include <windows.h>
#include <windowsx.h>
#include <shellapi.h>
......@@ -208,18 +206,6 @@ void DirectXEventThread( event_thread_t *p_event )
break;
}
case VK_F1: network_ChannelJoin( p_event, 1 ); break;
case VK_F2: network_ChannelJoin( p_event, 2 ); break;
case VK_F3: network_ChannelJoin( p_event, 3 ); break;
case VK_F4: network_ChannelJoin( p_event, 4 ); break;
case VK_F5: network_ChannelJoin( p_event, 5 ); break;
case VK_F6: network_ChannelJoin( p_event, 6 ); break;
case VK_F7: network_ChannelJoin( p_event, 7 ); break;
case VK_F8: network_ChannelJoin( p_event, 8 ); break;
case VK_F9: network_ChannelJoin( p_event, 9 ); break;
case VK_F10: network_ChannelJoin( p_event, 10 ); break;
case VK_F11: network_ChannelJoin( p_event, 11 ); break;
case VK_F12: network_ChannelJoin( p_event, 12 ); break;
}
TranslateMessage(&msg);
break;
......
modules/video_output/mga/xmga.c
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* xmga.c : X11 MGA plugin for vlc
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xmga.c,v 1.4 2003/03/30 18:14:39 gbazin Exp $
* $Id: xmga.c,v 1.5 2003/05/05 16:09:37 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -52,8 +52,6 @@
#include <X11/extensions/XShm.h>
#include <X11/extensions/dpms.h>
#include "netutils.h" /* network_ChannelJoin */
//#include "mga.h"
/*****************************************************************************
......@@ -469,19 +467,6 @@ static int Manage( vout_thread_t *p_vout )
INPUT_STATUS_PAUSE );
break;
case XK_F1: network_ChannelJoin( p_vout, 1 ); break;
case XK_F2: network_ChannelJoin( p_vout, 2 ); break;
case XK_F3: network_ChannelJoin( p_vout, 3 ); break;
case XK_F4: network_ChannelJoin( p_vout, 4 ); break;
case XK_F5: network_ChannelJoin( p_vout, 5 ); break;
case XK_F6: network_ChannelJoin( p_vout, 6 ); break;
case XK_F7: network_ChannelJoin( p_vout, 7 ); break;
case XK_F8: network_ChannelJoin( p_vout, 8 ); break;
case XK_F9: network_ChannelJoin( p_vout, 9 ); break;
case XK_F10: network_ChannelJoin( p_vout, 10 ); break;
case XK_F11: network_ChannelJoin( p_vout, 11 ); break;
case XK_F12: network_ChannelJoin( p_vout, 12 ); break;
default:
/* "Normal Keys"
* The reason why I use this instead of XK_0 is that
......
modules/video_output/qte/qte.cpp
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* qte.cpp : QT Embedded plugin for vlc
*****************************************************************************
* Copyright (C) 1998-2003 VideoLAN
* $Id: qte.cpp,v 1.17 2003/03/30 18:14:39 gbazin Exp $
* $Id: qte.cpp,v 1.18 2003/05/05 16:09:38 gbazin Exp $
*
* Authors: Gerald Hansink <gerald.hansink@ordain.nl>
* Jean-Paul Saman <jpsaman@wxs.nl>
......@@ -71,7 +71,6 @@ extern "C"
extern "C"
{
#include "netutils.h" /* network_ChannelJoin */
#include "qte.h"
/*****************************************************************************
......
modules/video_output/sdl.c
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* sdl.c: SDL video output display method
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: sdl.c,v 1.12 2003/05/04 12:40:58 sam Exp $
* $Id: sdl.c,v 1.13 2003/05/05 16:09:37 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org>
......@@ -42,8 +42,6 @@
#include SDL_INCLUDE_FILE
#include "netutils.h"
#define SDL_MAX_DIRECTBUFFERS 10
#define SDL_DEFAULT_BPP 16
......@@ -492,19 +490,6 @@ static int Manage( vout_thread_t *p_vout )
input_Seek( p_vout, -60, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
break;
case SDLK_F1: network_ChannelJoin( p_vout, 1 ); break;
case SDLK_F2: network_ChannelJoin( p_vout, 2 ); break;
case SDLK_F3: network_ChannelJoin( p_vout, 3 ); break;
case SDLK_F4: network_ChannelJoin( p_vout, 4 ); break;
case SDLK_F5: network_ChannelJoin( p_vout, 5 ); break;
case SDLK_F6: network_ChannelJoin( p_vout, 6 ); break;
case SDLK_F7: network_ChannelJoin( p_vout, 7 ); break;
case SDLK_F8: network_ChannelJoin( p_vout, 8 ); break;
case SDLK_F9: network_ChannelJoin( p_vout, 9 ); break;
case SDLK_F10: network_ChannelJoin( p_vout, 10 ); break;
case SDLK_F11: network_ChannelJoin( p_vout, 11 ); break;
case SDLK_F12: network_ChannelJoin( p_vout, 12 ); break;
case SDLK_b:
{
audio_volume_t i_volume;
......
modules/video_output/x11/xcommon.c
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xcommon.c,v 1.14 2003/02/09 23:42:06 sigmunau Exp $
* $Id: xcommon.c,v 1.15 2003/05/05 16:09:38 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -66,8 +66,6 @@
# include <X11/extensions/Xvlib.h>
#endif
#include "netutils.h" /* network_ChannelJoin */
#include "xcommon.h"
/*****************************************************************************
......@@ -567,19 +565,6 @@ static int ManageVideo( vout_thread_t *p_vout )
input_SetStatus( p_vout, INPUT_STATUS_PAUSE );
break;
case XK_F1: network_ChannelJoin( p_vout, 1 ); break;
case XK_F2: network_ChannelJoin( p_vout, 2 ); break;
case XK_F3: network_ChannelJoin( p_vout, 3 ); break;
case XK_F4: network_ChannelJoin( p_vout, 4 ); break;
case XK_F5: network_ChannelJoin( p_vout, 5 ); break;
case XK_F6: network_ChannelJoin( p_vout, 6 ); break;
case XK_F7: network_ChannelJoin( p_vout, 7 ); break;
case XK_F8: network_ChannelJoin( p_vout, 8 ); break;
case XK_F9: network_ChannelJoin( p_vout, 9 ); break;
case XK_F10: network_ChannelJoin( p_vout, 10 ); break;
case XK_F11: network_ChannelJoin( p_vout, 11 ); break;
case XK_F12: network_ChannelJoin( p_vout, 12 ); break;
default:
/* "Normal Keys"
* The reason why I use this instead of XK_0 is that
......
src/input/input.c
View file @ cf3c9805
......@@ -4,7 +4,7 @@
* decoders.
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: input.c,v 1.228 2003/03/30 01:13:37 massiot Exp $
* $Id: input.c,v 1.229 2003/05/05 16:09:35 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -36,7 +36,6 @@
# include <sys/times.h>
#endif
#include "netutils.h"
#include "vlc_playlist.h"
#include "stream_control.h"
......
src/libvlc.c
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.c,v 1.81 2003/04/24 17:44:53 gbazin Exp $
* $Id: libvlc.c,v 1.82 2003/05/05 16:09:35 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -64,7 +64,6 @@
#include "os_specific.h"
#include "error.h"
#include "netutils.h" /* network_ChannelJoin */
#include "stream_control.h"
#include "input_ext-intf.h"
......@@ -496,18 +495,6 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
p_vlc->pf_memset = memset;
}
/*
* Initialize shared resources and libraries
*/
if( config_GetInt( p_vlc, "network-channel" )
&& network_ChannelCreate( p_vlc ) )
{
/* On error during Channels initialization, switch off channels */
msg_Warn( p_vlc,
"channels initialization failed, deactivating channels" );
config_PutInt( p_vlc, "network-channel", VLC_FALSE );
}
/*
* Initialize playlist and get commandline files
*/
......@@ -629,14 +616,6 @@ int VLC_Destroy( int i_object )
return VLC_ENOOBJ;
}
/*
* Go back into channel 0 which is the network
*/
if( config_GetInt( p_vlc, "network-channel" ) && p_vlc->p_channel )
{
network_ChannelJoin( p_vlc, COMMON_CHANNEL );
}
/*
* Free allocated memory
*/
......
src/libvlc.h
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* libvlc.h: main libvlc header
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.h,v 1.58 2003/05/04 23:38:06 massiot Exp $
* $Id: libvlc.h,v 1.59 2003/05/05 16:09:35 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -210,23 +210,6 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL };
"This is the typical size of UDP packets that we expect. On Ethernet " \
"it is usually 1500.")
#define NETCHANNEL_TEXT N_("Enable network channel mode")
#define NETCHANNEL_LONGTEXT N_( \
"Activate this option if you want to use the VideoLAN Channel Server.")
#define CHAN_SERV_TEXT N_("Channel server address")
#define CHAN_SERV_LONGTEXT N_( \
"Indicate here the address of the VideoLAN Channel Server.")
#define CHAN_PORT_TEXT N_("Channel server port")
#define CHAN_PORT_LONGTEXT N_( \
"Indicate here the port on which the VideoLAN Channel Server runs.")
#define IFACE_TEXT N_("Network interface")
#define IFACE_LONGTEXT N_( \
"If you have several interfaces on your Linux machine and use the " \
"VLAN solution, you may indicate here which interface to use.")
#define IFACE_ADDR_TEXT N_("Network interface address")
#define IFACE_ADDR_LONGTEXT N_( \
"If you have several interfaces on your machine and use the " \
......@@ -507,18 +490,7 @@ vlc_module_begin();
add_category_hint( N_("Input"), NULL, VLC_FALSE );
add_integer( "server-port", 1234, NULL,
SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT, VLC_FALSE );
add_bool( "network-channel", 0, NULL,
NETCHANNEL_TEXT, NETCHANNEL_LONGTEXT, VLC_TRUE );
add_string( "channel-server", "localhost", NULL,
CHAN_SERV_TEXT, CHAN_SERV_LONGTEXT, VLC_TRUE );
add_integer( "channel-port", 6010, NULL,
CHAN_PORT_TEXT, CHAN_PORT_LONGTEXT, VLC_TRUE );
add_integer( "mtu", 1500, NULL, MTU_TEXT, MTU_LONGTEXT, VLC_TRUE );
#ifdef SYS_DARWIN
add_string( "iface", "en0", NULL, IFACE_TEXT, IFACE_LONGTEXT, VLC_TRUE );
#else
add_string( "iface", "eth0", NULL, IFACE_TEXT, IFACE_LONGTEXT, VLC_TRUE );
#endif
add_string( "iface-addr", "", NULL, IFACE_ADDR_TEXT, IFACE_ADDR_LONGTEXT, VLC_TRUE );
add_integer( "ttl", 1, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_TRUE );
......
src/misc/modules.c
View file @ cf3c9805
......@@ -2,7 +2,7 @@
* modules.c : Builtin and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.c,v 1.118 2003/04/14 22:22:32 massiot Exp $
* $Id: modules.c,v 1.119 2003/05/05 16:09:36 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
......@@ -68,7 +68,6 @@
#endif
#include "error.h"
#include "netutils.h"
#include "interface.h"
#include "vlc_playlist.h"
......
src/misc/netutils.c deleted 100644 → 0
View file @ ad3713cb
This diff is collapsed.
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