]> git.sesse.net Git - vlc/commitdiff
* New Network dialog box for Gtk and Gnome interfaces
authorOlivier Teulière <ipkiss@videolan.org>
Sat, 18 May 2002 02:12:20 +0000 (02:12 +0000)
committerOlivier Teulière <ipkiss@videolan.org>
Sat, 18 May 2002 02:12:20 +0000 (02:12 +0000)
12 files changed:
plugins/gtk/gnome.glade
plugins/gtk/gnome_callbacks.c
plugins/gtk/gnome_callbacks.h
plugins/gtk/gnome_interface.c
plugins/gtk/gtk.glade
plugins/gtk/gtk_callbacks.c
plugins/gtk/gtk_callbacks.h
plugins/gtk/gtk_interface.c
plugins/gtk/gtk_interface.h
plugins/gtk/gtk_open.c
plugins/gtk/gtk_support.c
plugins/gtk/gtk_support.h

index c9c5a81246c9f0ddd06f78947a2c4ad19e8aa473..d4ebd212ec33ef44917070285ad4b5ac880dc316 100644 (file)
@@ -1872,10 +1872,11 @@ http://www.videolan.org/
     </widget>
 
     <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <homogeneous>False</homogeneous>
-      <spacing>5</spacing>
+      <class>GtkFrame</class>
+      <name>frame14</name>
+      <label>Network mode</label>
+      <label_xalign>0</label_xalign>
+      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
       <child>
        <padding>0</padding>
        <expand>True</expand>
@@ -1883,355 +1884,489 @@ http://www.videolan.org/
       </child>
 
       <widget>
-       <class>GtkFrame</class>
-       <name>frame3</name>
-       <label>Protocol</label>
-       <label_xalign>0</label_xalign>
-       <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-       <child>
-         <padding>0</padding>
-         <expand>True</expand>
-         <fill>True</fill>
-       </child>
+       <class>GtkTable</class>
+       <name>table6</name>
+       <border_width>9</border_width>
+       <rows>4</rows>
+       <columns>6</columns>
+       <homogeneous>False</homogeneous>
+       <row_spacing>0</row_spacing>
+       <column_spacing>6</column_spacing>
 
        <widget>
-         <class>GtkVBox</class>
-         <name>vbox6</name>
-         <homogeneous>False</homogeneous>
-         <spacing>0</spacing>
+         <class>GtkRadioButton</class>
+         <name>network_udp</name>
+         <can_focus>True</can_focus>
+         <signal>
+           <name>toggled</name>
+           <handler>GtkNetworkOpenUDP</handler>
+           <data>&quot;intf_network&quot;</data>
+           <last_modification_time>Sat, 18 May 2002 00:45:31 GMT</last_modification_time>
+         </signal>
+         <label>UDP</label>
+         <active>False</active>
+         <draw_indicator>True</draw_indicator>
+         <child>
+           <left_attach>0</left_attach>
+           <right_attach>1</right_attach>
+           <top_attach>0</top_attach>
+           <bottom_attach>1</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_ts</name>
-           <can_focus>True</can_focus>
-           <label>TS</label>
-           <active>False</active>
-           <draw_indicator>True</draw_indicator>
-           <group>network</group>
-           <child>
-             <padding>0</padding>
-             <expand>False</expand>
-             <fill>False</fill>
-           </child>
-         </widget>
+       <widget>
+         <class>GtkRadioButton</class>
+         <name>network_multicast</name>
+         <can_focus>True</can_focus>
+         <signal>
+           <name>toggled</name>
+           <handler>GtkNetworkOpenMulticast</handler>
+           <data>&quot;intf_network&quot;</data>
+           <last_modification_time>Sat, 18 May 2002 00:45:39 GMT</last_modification_time>
+         </signal>
+         <label>UDP Multicast</label>
+         <active>False</active>
+         <draw_indicator>True</draw_indicator>
+         <child>
+           <left_attach>0</left_attach>
+           <right_attach>1</right_attach>
+           <top_attach>1</top_attach>
+           <bottom_attach>2</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_rtp</name>
-           <sensitive>False</sensitive>
-           <can_focus>True</can_focus>
-           <label>RTP</label>
-           <active>False</active>
-           <draw_indicator>True</draw_indicator>
-           <group>network</group>
-           <child>
-             <padding>0</padding>
-             <expand>False</expand>
-             <fill>False</fill>
-           </child>
-         </widget>
+       <widget>
+         <class>GtkRadioButton</class>
+         <name>network_channel</name>
+         <can_focus>True</can_focus>
+         <signal>
+           <name>toggled</name>
+           <handler>GtkNetworkOpenChannel</handler>
+           <data>&quot;intf_network&quot;</data>
+           <last_modification_time>Sat, 18 May 2002 00:45:45 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>
-           <can_focus>True</can_focus>
-           <label>HTTP</label>
-           <active>False</active>
-           <draw_indicator>True</draw_indicator>
-           <group>network</group>
-           <child>
-             <padding>0</padding>
-             <expand>False</expand>
-             <fill>False</fill>
-           </child>
-         </widget>
+       <widget>
+         <class>GtkRadioButton</class>
+         <name>network_http</name>
+         <can_focus>True</can_focus>
+         <signal>
+           <name>toggled</name>
+           <handler>GtkNetworkOpenHTTP</handler>
+           <data>&quot;intf_network&quot;</data>
+           <last_modification_time>Sat, 18 May 2002 00:45:54 GMT</last_modification_time>
+         </signal>
+         <label>HTTP</label>
+         <active>False</active>
+         <draw_indicator>True</draw_indicator>
+         <child>
+           <left_attach>0</left_attach>
+           <right_attach>1</right_attach>
+           <top_attach>3</top_attach>
+           <bottom_attach>4</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>
 
-      <widget>
-       <class>GtkFrame</class>
-       <name>frame4</name>
-       <label>Server</label>
-       <label_xalign>0</label_xalign>
-       <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-       <child>
-         <padding>0</padding>
-         <expand>True</expand>
-         <fill>True</fill>
-       </child>
+       <widget>
+         <class>GtkLabel</class>
+         <name>network_udp_port_label</name>
+         <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>1</left_attach>
+           <right_attach>2</right_attach>
+           <top_attach>0</top_attach>
+           <bottom_attach>1</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>GtkTable</class>
-         <name>table2</name>
-         <border_width>5</border_width>
-         <rows>3</rows>
-         <columns>2</columns>
-         <homogeneous>False</homogeneous>
-         <row_spacing>5</row_spacing>
-         <column_spacing>5</column_spacing>
+         <class>GtkLabel</class>
+         <name>network_multicast_address_label</name>
+         <sensitive>False</sensitive>
+         <label>Address</label>
+         <justify>GTK_JUSTIFY_RIGHT</justify>
+         <wrap>False</wrap>
+         <xalign>1</xalign>
+         <yalign>0.5</yalign>
+         <xpad>0</xpad>
+         <ypad>0</ypad>
+         <child>
+           <left_attach>1</left_attach>
+           <right_attach>2</right_attach>
+           <top_attach>1</top_attach>
+           <bottom_attach>2</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_server_label</name>
-           <label>Address</label>
-           <justify>GTK_JUSTIFY_CENTER</justify>
-           <wrap>False</wrap>
-           <xalign>0</xalign>
-           <yalign>0.5</yalign>
+       <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>
-           <child>
-             <left_attach>0</left_attach>
-             <right_attach>1</right_attach>
-             <top_attach>0</top_attach>
-             <bottom_attach>1</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>
+           <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_port_label</name>
-           <label>Port</label>
-           <justify>GTK_JUSTIFY_CENTER</justify>
-           <wrap>False</wrap>
-           <xalign>0</xalign>
-           <yalign>0.5</yalign>
+       <widget>
+         <class>GtkLabel</class>
+         <name>network_http_url_label</name>
+         <sensitive>False</sensitive>
+         <label>URL</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>1</left_attach>
+           <right_attach>2</right_attach>
+           <top_attach>3</top_attach>
+           <bottom_attach>4</bottom_attach>
            <xpad>0</xpad>
            <ypad>0</ypad>
-           <child>
-             <left_attach>0</left_attach>
-             <right_attach>1</right_attach>
-             <top_attach>1</top_attach>
-             <bottom_attach>2</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>
+           <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_port</name>
-           <tooltip>Port of the stream server</tooltip>
-           <can_focus>True</can_focus>
-           <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>1234</value>
-           <lower>1024</lower>
-           <upper>65535</upper>
-           <step>1</step>
-           <page>10</page>
-           <page_size>10</page_size>
-           <child>
-             <left_attach>1</left_attach>
-             <right_attach>2</right_attach>
-             <top_attach>1</top_attach>
-             <bottom_attach>2</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>GtkCombo</class>
+         <name>network_multicast_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>1</top_attach>
+           <bottom_attach>2</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>GtkCheckButton</class>
-           <name>network_broadcast_check</name>
+           <class>GtkEntry</class>
+           <child_name>GtkCombo:entry</child_name>
+           <name>network_multicast_address</name>
            <can_focus>True</can_focus>
-           <signal>
-             <name>toggled</name>
-             <handler>GtkNetworkOpenBroadcast</handler>
-             <data>&quot;intf_network&quot;</data>
-             <last_modification_time>Wed, 30 May 2001 13:30:02 GMT</last_modification_time>
-           </signal>
-           <label>Broadcast</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>GnomeEntry</class>
-           <name>network_broadcast_combo</name>
-           <max_saved>10</max_saved>
-           <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>True</xexpand>
-             <yexpand>False</yexpand>
-             <xshrink>False</xshrink>
-             <yshrink>False</yshrink>
-             <xfill>True</xfill>
-             <yfill>False</yfill>
-           </child>
-
-           <widget>
-             <class>GtkEntry</class>
-             <child_name>GnomeEntry:entry</child_name>
-             <name>network_broadcast</name>
-             <sensitive>False</sensitive>
-             <can_focus>True</can_focus>
-             <editable>True</editable>
-             <text_visible>True</text_visible>
-             <text_max_length>0</text_max_length>
-             <text>138.195.143.255</text>
-           </widget>
-         </widget>
-
-         <widget>
-           <class>GnomeEntry</class>
-           <name>network_server_combo</name>
-           <max_saved>10</max_saved>
-           <child>
-             <left_attach>1</left_attach>
-             <right_attach>2</right_attach>
-             <top_attach>0</top_attach>
-             <bottom_attach>1</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>GnomeEntry:entry</child_name>
-             <name>network_server</name>
-             <can_focus>True</can_focus>
-             <editable>True</editable>
-             <text_visible>True</text_visible>
-             <text_max_length>0</text_max_length>
-             <text>vls</text>
-           </widget>
+           <editable>True</editable>
+           <text_visible>True</text_visible>
+           <text_max_length>0</text_max_length>
+           <text></text>
          </widget>
        </widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame5</name>
-      <label>Channels</label>
-      <label_xalign>0.05</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-       <padding>0</padding>
-       <expand>True</expand>
-       <fill>True</fill>
-      </child>
-
-      <widget>
-       <class>GtkHBox</class>
-       <name>hbox4</name>
-       <homogeneous>False</homogeneous>
-       <spacing>0</spacing>
 
        <widget>
-         <class>GtkCheckButton</class>
-         <name>network_channel_check</name>
+         <class>GtkSpinButton</class>
+         <name>network_udp_port</name>
+         <width>1</width>
          <can_focus>True</can_focus>
-         <signal>
-           <name>toggled</name>
-           <handler>GtkNetworkOpenChannel</handler>
-           <data>&quot;intf_network&quot;</data>
-           <last_modification_time>Wed, 30 May 2001 13:30:25 GMT</last_modification_time>
-         </signal>
-         <label>Channel server:</label>
-         <active>False</active>
-         <draw_indicator>True</draw_indicator>
+         <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>1234</value>
+         <lower>0</lower>
+         <upper>65535</upper>
+         <step>1</step>
+         <page>10</page>
+         <page_size>10</page_size>
          <child>
-           <padding>0</padding>
-           <expand>False</expand>
-           <fill>False</fill>
+           <left_attach>2</left_attach>
+           <right_attach>3</right_attach>
+           <top_attach>0</top_attach>
+           <bottom_attach>1</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>GnomeEntry</class>
-         <name>network_channel_combo</name>
+         <class>GtkCombo</class>
+         <name>network_channel_address_combo</name>
          <sensitive>False</sensitive>
-         <max_saved>10</max_saved>
+         <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>
-           <padding>0</padding>
-           <expand>False</expand>
-           <fill>False</fill>
+           <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>GnomeEntry:entry</child_name>
-           <name>network_channel</name>
+           <child_name>GtkCombo:entry</child_name>
+           <name>network_channel_address</name>
            <can_focus>True</can_focus>
            <editable>True</editable>
            <text_visible>True</text_visible>
            <text_max_length>0</text_max_length>
-           <text>138.195.143.120</text>
+           <text></text>
          </widget>
        </widget>
 
+       <widget>
+         <class>GtkLabel</class>
+         <name>network_multicast_port_label</name>
+         <width>51</width>
+         <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>1</top_attach>
+           <bottom_attach>2</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_channel_port_label</name>
-         <label>port:</label>
+         <sensitive>False</sensitive>
+         <label>Port</label>
          <justify>GTK_JUSTIFY_CENTER</justify>
          <wrap>False</wrap>
-         <xalign>0.5</xalign>
+         <xalign>1</xalign>
          <yalign>0.5</yalign>
          <xpad>0</xpad>
          <ypad>0</ypad>
          <child>
-           <padding>5</padding>
-           <expand>False</expand>
-           <fill>False</fill>
+           <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>GtkEntry</class>
+         <name>network_http_url</name>
+         <sensitive>False</sensitive>
+         <can_focus>True</can_focus>
+         <editable>True</editable>
+         <text_visible>True</text_visible>
+         <text_max_length>0</text_max_length>
+         <text></text>
+         <child>
+           <left_attach>2</left_attach>
+           <right_attach>6</right_attach>
+           <top_attach>3</top_attach>
+           <bottom_attach>4</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>GtkLabel</class>
+         <name>label42</name>
+         <label></label>
+         <justify>GTK_JUSTIFY_CENTER</justify>
+         <wrap>False</wrap>
+         <xalign>0</xalign>
+         <yalign>0.5</yalign>
+         <xpad>0</xpad>
+         <ypad>0</ypad>
+         <child>
+           <left_attach>3</left_attach>
+           <right_attach>6</right_attach>
+           <top_attach>0</top_attach>
+           <bottom_attach>1</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>GtkSpinButton</class>
+         <name>network_multicast_port</name>
+         <width>75</width>
+         <sensitive>False</sensitive>
+         <can_focus>True</can_focus>
+         <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>1234</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>1</top_attach>
+           <bottom_attach>2</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_channel_port</name>
-         <width>60</width>
+         <width>75</width>
          <sensitive>False</sensitive>
          <can_focus>True</can_focus>
          <climb_rate>1</climb_rate>
@@ -2241,15 +2376,24 @@ http://www.videolan.org/
          <snap>False</snap>
          <wrap>False</wrap>
          <value>6010</value>
-         <lower>1024</lower>
+         <lower>0</lower>
          <upper>65535</upper>
          <step>1</step>
          <page>10</page>
          <page_size>10</page_size>
          <child>
-           <padding>0</padding>
-           <expand>False</expand>
-           <fill>False</fill>
+           <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>False</xexpand>
+           <yexpand>False</yexpand>
+           <xshrink>False</xshrink>
+           <yshrink>False</yshrink>
+           <xfill>True</xfill>
+           <yfill>False</yfill>
          </child>
        </widget>
       </widget>
index 1f8c3c767ee2b682d44b22ec0e109a239cd0c097..a5cf9d526f3f199264320a898fd66a575448aad5 100644 (file)
@@ -273,3 +273,4 @@ GnomeMenubarMessagesActivate           (GtkMenuItem     *menuitem,
 {
     GtkMessagesShow( GTK_WIDGET( menuitem ), NULL, "intf_window" );
 }
+
index d19675c5a86ed565bf9c805a3fe62fccbbdfd596..86569ea61071ff76632676be8a2007567b71e436 100644 (file)
@@ -163,3 +163,35 @@ GtkSatOpenOk                           (GtkButton       *button,
 void
 GtkSatOpenCancel                       (GtkButton       *button,
                                         gpointer         user_data);
+
+void
+GnomeNetworkOpenUDP                    (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+void
+GnomeNetworkOpenMulticast              (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+void
+GnomeNetworkOpenChannel                (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+void
+GnomeNetworkOpenHTTP                   (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+void
+GtkNetworkOpenUDP                      (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+void
+GtkNetworkOpenMulticast                (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+void
+GtkNetworkOpenChannel                  (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+void
+GtkNetworkOpenHTTP                     (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
index aff63932956758638f0e47add2e94e26a1e26f74..446a24e6e1a3cb4859fd14d4cf8a428f911bdbb7 100644 (file)
@@ -1410,38 +1410,34 @@ create_intf_network (void)
 {
   GtkWidget *intf_network;
   GtkWidget *vbox5;
-  GtkWidget *hbox3;
-  GtkWidget *frame3;
-  GtkWidget *vbox6;
-  GSList *network_group = NULL;
-  GtkWidget *network_ts;
-  GtkWidget *network_rtp;
-  GtkWidget *network_http;
-  GtkWidget *frame4;
-  GtkWidget *table2;
-  GtkWidget *network_server_label;
-  GtkWidget *network_port_label;
-  GtkObject *network_port_adj;
-  GtkWidget *network_port;
-  GtkWidget *network_broadcast_check;
-  GtkWidget *network_broadcast_combo;
-  GtkWidget *network_broadcast;
-  GtkWidget *network_server_combo;
-  GtkWidget *network_server;
-  GtkWidget *frame5;
-  GtkWidget *hbox4;
-  GtkWidget *network_channel_check;
-  GtkWidget *network_channel_combo;
+  GtkWidget *frame14;
+  GtkWidget *table6;
+  GSList *table6_group = NULL;
+  GtkWidget *network_udp;
+  GtkWidget *network_multicast;
   GtkWidget *network_channel;
+  GtkWidget *network_http;
+  GtkWidget *network_udp_port_label;
+  GtkWidget *network_multicast_address_label;
+  GtkWidget *network_channel_address_label;
+  GtkWidget *network_http_url_label;
+  GtkWidget *network_multicast_address_combo;
+  GtkWidget *network_multicast_address;
+  GtkObject *network_udp_port_adj;
+  GtkWidget *network_udp_port;
+  GtkWidget *network_channel_address_combo;
+  GtkWidget *network_channel_address;
+  GtkWidget *network_multicast_port_label;
   GtkWidget *network_channel_port_label;
+  GtkWidget *network_http_url;
+  GtkWidget *label42;
+  GtkObject *network_multicast_port_adj;
+  GtkWidget *network_multicast_port;
   GtkObject *network_channel_port_adj;
   GtkWidget *network_channel_port;
   GtkWidget *hbuttonbox1;
   GtkWidget *network_ok;
   GtkWidget *network_cancel;
-  GtkTooltips *tooltips;
-
-  tooltips = gtk_tooltips_new ();
 
   intf_network = gnome_dialog_new (_("Network Stream"), NULL);
   gtk_object_set_data (GTK_OBJECT (intf_network), "intf_network", intf_network);
@@ -1452,194 +1448,213 @@ create_intf_network (void)
   gtk_object_set_data (GTK_OBJECT (intf_network), "vbox5", vbox5);
   gtk_widget_show (vbox5);
 
-  hbox3 = gtk_hbox_new (FALSE, 5);
-  gtk_widget_ref (hbox3);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "hbox3", hbox3,
+  frame14 = gtk_frame_new (_("Network mode"));
+  gtk_widget_ref (frame14);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "frame14", frame14,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (hbox3);
-  gtk_box_pack_start (GTK_BOX (vbox5), hbox3, TRUE, TRUE, 0);
+  gtk_widget_show (frame14);
+  gtk_box_pack_start (GTK_BOX (vbox5), frame14, TRUE, TRUE, 0);
 
-  frame3 = gtk_frame_new (_("Protocol"));
-  gtk_widget_ref (frame3);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "frame3", frame3,
+  table6 = gtk_table_new (4, 6, FALSE);
+  gtk_widget_ref (table6);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "table6", table6,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (frame3);
-  gtk_box_pack_start (GTK_BOX (hbox3), frame3, TRUE, TRUE, 0);
+  gtk_widget_show (table6);
+  gtk_container_add (GTK_CONTAINER (frame14), table6);
+  gtk_container_set_border_width (GTK_CONTAINER (table6), 9);
+  gtk_table_set_col_spacings (GTK_TABLE (table6), 6);
 
-  vbox6 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox6);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "vbox6", vbox6,
+  network_udp = gtk_radio_button_new_with_label (table6_group, _("UDP"));
+  table6_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_udp));
+  gtk_widget_ref (network_udp);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_udp", network_udp,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (vbox6);
-  gtk_container_add (GTK_CONTAINER (frame3), vbox6);
+  gtk_widget_show (network_udp);
+  gtk_table_attach (GTK_TABLE (table6), network_udp, 0, 1, 0, 1,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
 
-  network_ts = gtk_radio_button_new_with_label (network_group, _("TS"));
-  network_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_ts));
-  gtk_widget_ref (network_ts);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_ts", network_ts,
+  network_multicast = gtk_radio_button_new_with_label (table6_group, _("UDP Multicast"));
+  table6_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_multicast));
+  gtk_widget_ref (network_multicast);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_multicast", network_multicast,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_ts);
-  gtk_box_pack_start (GTK_BOX (vbox6), network_ts, FALSE, FALSE, 0);
+  gtk_widget_show (network_multicast);
+  gtk_table_attach (GTK_TABLE (table6), network_multicast, 0, 1, 1, 2,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
 
-  network_rtp = gtk_radio_button_new_with_label (network_group, _("RTP"));
-  network_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_rtp));
-  gtk_widget_ref (network_rtp);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_rtp", network_rtp,
+  network_channel = gtk_radio_button_new_with_label (table6_group, _("Channel server "));
+  table6_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_channel));
+  gtk_widget_ref (network_channel);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel", network_channel,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_rtp);
-  gtk_box_pack_start (GTK_BOX (vbox6), network_rtp, FALSE, FALSE, 0);
-  gtk_widget_set_sensitive (network_rtp, FALSE);
+  gtk_widget_show (network_channel);
+  gtk_table_attach (GTK_TABLE (table6), network_channel, 0, 1, 2, 3,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
 
-  network_http = gtk_radio_button_new_with_label (network_group, _("HTTP"));
-  network_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_http));
+  network_http = gtk_radio_button_new_with_label (table6_group, _("HTTP"));
+  table6_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_http));
   gtk_widget_ref (network_http);
   gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_http", network_http,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (network_http);
-  gtk_box_pack_start (GTK_BOX (vbox6), network_http, FALSE, FALSE, 0);
-
-  frame4 = gtk_frame_new (_("Server"));
-  gtk_widget_ref (frame4);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "frame4", frame4,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (frame4);
-  gtk_box_pack_start (GTK_BOX (hbox3), frame4, TRUE, TRUE, 0);
-
-  table2 = gtk_table_new (3, 2, FALSE);
-  gtk_widget_ref (table2);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "table2", table2,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (table2);
-  gtk_container_add (GTK_CONTAINER (frame4), table2);
-  gtk_container_set_border_width (GTK_CONTAINER (table2), 5);
-  gtk_table_set_row_spacings (GTK_TABLE (table2), 5);
-  gtk_table_set_col_spacings (GTK_TABLE (table2), 5);
+  gtk_table_attach (GTK_TABLE (table6), network_http, 0, 1, 3, 4,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
 
-  network_server_label = gtk_label_new (_("Address"));
-  gtk_widget_ref (network_server_label);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_server_label", network_server_label,
+  network_udp_port_label = gtk_label_new (_("Port"));
+  gtk_widget_ref (network_udp_port_label);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_udp_port_label", network_udp_port_label,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_server_label);
-  gtk_table_attach (GTK_TABLE (table2), network_server_label, 0, 1, 0, 1,
+  gtk_widget_show (network_udp_port_label);
+  gtk_table_attach (GTK_TABLE (table6), network_udp_port_label, 1, 2, 0, 1,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (network_server_label), 0, 0.5);
+  gtk_misc_set_alignment (GTK_MISC (network_udp_port_label), 1, 0.5);
 
-  network_port_label = gtk_label_new (_("Port"));
-  gtk_widget_ref (network_port_label);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_port_label", network_port_label,
+  network_multicast_address_label = gtk_label_new (_("Address"));
+  gtk_widget_ref (network_multicast_address_label);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_multicast_address_label", network_multicast_address_label,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_port_label);
-  gtk_table_attach (GTK_TABLE (table2), network_port_label, 0, 1, 1, 2,
+  gtk_widget_show (network_multicast_address_label);
+  gtk_table_attach (GTK_TABLE (table6), network_multicast_address_label, 1, 2, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (network_port_label), 0, 0.5);
+  gtk_widget_set_sensitive (network_multicast_address_label, FALSE);
+  gtk_label_set_justify (GTK_LABEL (network_multicast_address_label), GTK_JUSTIFY_RIGHT);
+  gtk_misc_set_alignment (GTK_MISC (network_multicast_address_label), 1, 0.5);
 
-  network_port_adj = gtk_adjustment_new (1234, 1024, 65535, 1, 10, 10);
-  network_port = gtk_spin_button_new (GTK_ADJUSTMENT (network_port_adj), 1, 0);
-  gtk_widget_ref (network_port);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_port", network_port,
+  network_channel_address_label = gtk_label_new (_("Address"));
+  gtk_widget_ref (network_channel_address_label);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_address_label", network_channel_address_label,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_port);
-  gtk_table_attach (GTK_TABLE (table2), network_port, 1, 2, 1, 2,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+  gtk_widget_show (network_channel_address_label);
+  gtk_table_attach (GTK_TABLE (table6), network_channel_address_label, 1, 2, 2, 3,
+                    (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_tooltips_set_tip (tooltips, network_port, _("Port of the stream server"), NULL);
+  gtk_widget_set_sensitive (network_channel_address_label, FALSE);
 
-  network_broadcast_check = gtk_check_button_new_with_label (_("Broadcast"));
-  gtk_widget_ref (network_broadcast_check);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_broadcast_check", network_broadcast_check,
+  network_http_url_label = gtk_label_new (_("URL"));
+  gtk_widget_ref (network_http_url_label);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_http_url_label", network_http_url_label,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_broadcast_check);
-  gtk_table_attach (GTK_TABLE (table2), network_broadcast_check, 0, 1, 2, 3,
+  gtk_widget_show (network_http_url_label);
+  gtk_table_attach (GTK_TABLE (table6), network_http_url_label, 1, 2, 3, 4,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_sensitive (network_http_url_label, FALSE);
+  gtk_misc_set_alignment (GTK_MISC (network_http_url_label), 1, 0.5);
 
-  network_broadcast_combo = gnome_entry_new (NULL);
-  gtk_widget_ref (network_broadcast_combo);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_broadcast_combo", network_broadcast_combo,
+  network_multicast_address_combo = gtk_combo_new ();
+  gtk_widget_ref (network_multicast_address_combo);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_multicast_address_combo", network_multicast_address_combo,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_broadcast_combo);
-  gtk_table_attach (GTK_TABLE (table2), network_broadcast_combo, 1, 2, 2, 3,
+  gtk_widget_show (network_multicast_address_combo);
+  gtk_table_attach (GTK_TABLE (table6), network_multicast_address_combo, 2, 4, 1, 2,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_sensitive (network_multicast_address_combo, FALSE);
 
-  network_broadcast = gnome_entry_gtk_entry (GNOME_ENTRY (network_broadcast_combo));
-  gtk_widget_ref (network_broadcast);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_broadcast", network_broadcast,
+  network_multicast_address = GTK_COMBO (network_multicast_address_combo)->entry;
+  gtk_widget_ref (network_multicast_address);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_multicast_address", network_multicast_address,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_broadcast);
-  gtk_widget_set_sensitive (network_broadcast, FALSE);
-  gtk_entry_set_text (GTK_ENTRY (network_broadcast), _("138.195.143.255"));
+  gtk_widget_show (network_multicast_address);
 
-  network_server_combo = gnome_entry_new (NULL);
-  gtk_widget_ref (network_server_combo);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_server_combo", network_server_combo,
+  network_udp_port_adj = gtk_adjustment_new (1234, 0, 65535, 1, 10, 10);
+  network_udp_port = gtk_spin_button_new (GTK_ADJUSTMENT (network_udp_port_adj), 1, 0);
+  gtk_widget_ref (network_udp_port);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_udp_port", network_udp_port,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_server_combo);
-  gtk_table_attach (GTK_TABLE (table2), network_server_combo, 1, 2, 0, 1,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+  gtk_widget_show (network_udp_port);
+  gtk_table_attach (GTK_TABLE (table6), network_udp_port, 2, 3, 0, 1,
+                    (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_usize (network_udp_port, 1, -2);
 
-  network_server = gnome_entry_gtk_entry (GNOME_ENTRY (network_server_combo));
-  gtk_widget_ref (network_server);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_server", network_server,
+  network_channel_address_combo = gtk_combo_new ();
+  gtk_widget_ref (network_channel_address_combo);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_address_combo", network_channel_address_combo,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_server);
-  gtk_entry_set_text (GTK_ENTRY (network_server), _("vls"));
+  gtk_widget_show (network_channel_address_combo);
+  gtk_table_attach (GTK_TABLE (table6), network_channel_address_combo, 2, 4, 2, 3,
+                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_sensitive (network_channel_address_combo, FALSE);
 
-  frame5 = gtk_frame_new (_("Channels"));
-  gtk_widget_ref (frame5);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "frame5", frame5,
+  network_channel_address = GTK_COMBO (network_channel_address_combo)->entry;
+  gtk_widget_ref (network_channel_address);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_address", network_channel_address,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (frame5);
-  gtk_box_pack_start (GTK_BOX (vbox5), frame5, TRUE, TRUE, 0);
-  gtk_frame_set_label_align (GTK_FRAME (frame5), 0.05, 0.5);
+  gtk_widget_show (network_channel_address);
 
-  hbox4 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref (hbox4);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "hbox4", hbox4,
+  network_multicast_port_label = gtk_label_new (_("Port"));
+  gtk_widget_ref (network_multicast_port_label);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_multicast_port_label", network_multicast_port_label,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (hbox4);
-  gtk_container_add (GTK_CONTAINER (frame5), hbox4);
+  gtk_widget_show (network_multicast_port_label);
+  gtk_table_attach (GTK_TABLE (table6), network_multicast_port_label, 4, 5, 1, 2,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_usize (network_multicast_port_label, 51, -2);
+  gtk_widget_set_sensitive (network_multicast_port_label, FALSE);
+  gtk_misc_set_alignment (GTK_MISC (network_multicast_port_label), 1, 0.5);
 
-  network_channel_check = gtk_check_button_new_with_label (_("Channel server:"));
-  gtk_widget_ref (network_channel_check);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_check", network_channel_check,
+  network_channel_port_label = gtk_label_new (_("Port"));
+  gtk_widget_ref (network_channel_port_label);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_port_label", network_channel_port_label,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_channel_check);
-  gtk_box_pack_start (GTK_BOX (hbox4), network_channel_check, FALSE, FALSE, 0);
+  gtk_widget_show (network_channel_port_label);
+  gtk_table_attach (GTK_TABLE (table6), network_channel_port_label, 4, 5, 2, 3,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_sensitive (network_channel_port_label, FALSE);
+  gtk_misc_set_alignment (GTK_MISC (network_channel_port_label), 1, 0.5);
 
-  network_channel_combo = gnome_entry_new (NULL);
-  gtk_widget_ref (network_channel_combo);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_combo", network_channel_combo,
+  network_http_url = gtk_entry_new ();
+  gtk_widget_ref (network_http_url);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_http_url", network_http_url,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_channel_combo);
-  gtk_box_pack_start (GTK_BOX (hbox4), network_channel_combo, FALSE, FALSE, 0);
-  gtk_widget_set_sensitive (network_channel_combo, FALSE);
+  gtk_widget_show (network_http_url);
+  gtk_table_attach (GTK_TABLE (table6), network_http_url, 2, 6, 3, 4,
+                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_sensitive (network_http_url, FALSE);
 
-  network_channel = gnome_entry_gtk_entry (GNOME_ENTRY (network_channel_combo));
-  gtk_widget_ref (network_channel);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel", network_channel,
+  label42 = gtk_label_new ("");
+  gtk_widget_ref (label42);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "label42", label42,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_channel);
-  gtk_entry_set_text (GTK_ENTRY (network_channel), _("138.195.143.120"));
+  gtk_widget_show (label42);
+  gtk_table_attach (GTK_TABLE (table6), label42, 3, 6, 0, 1,
+                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (label42), 0, 0.5);
 
-  network_channel_port_label = gtk_label_new (_("port:"));
-  gtk_widget_ref (network_channel_port_label);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_port_label", network_channel_port_label,
+  network_multicast_port_adj = gtk_adjustment_new (1234, 0, 65535, 1, 10, 10);
+  network_multicast_port = gtk_spin_button_new (GTK_ADJUSTMENT (network_multicast_port_adj), 1, 0);
+  gtk_widget_ref (network_multicast_port);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_multicast_port", network_multicast_port,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_channel_port_label);
-  gtk_box_pack_start (GTK_BOX (hbox4), network_channel_port_label, FALSE, FALSE, 5);
+  gtk_widget_show (network_multicast_port);
+  gtk_table_attach (GTK_TABLE (table6), network_multicast_port, 5, 6, 1, 2,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_usize (network_multicast_port, 75, -2);
+  gtk_widget_set_sensitive (network_multicast_port, FALSE);
 
-  network_channel_port_adj = gtk_adjustment_new (6010, 1024, 65535, 1, 10, 10);
+  network_channel_port_adj = gtk_adjustment_new (6010, 0, 65535, 1, 10, 10);
   network_channel_port = gtk_spin_button_new (GTK_ADJUSTMENT (network_channel_port_adj), 1, 0);
   gtk_widget_ref (network_channel_port);
   gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_port", network_channel_port,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (network_channel_port);
-  gtk_box_pack_start (GTK_BOX (hbox4), network_channel_port, FALSE, FALSE, 0);
-  gtk_widget_set_usize (network_channel_port, 60, -2);
+  gtk_table_attach (GTK_TABLE (table6), network_channel_port, 5, 6, 2, 3,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_usize (network_channel_port, 75, -2);
   gtk_widget_set_sensitive (network_channel_port, FALSE);
 
   hbuttonbox1 = GNOME_DIALOG (intf_network)->action_area;
@@ -1664,12 +1679,18 @@ create_intf_network (void)
   gtk_widget_show (network_cancel);
   GTK_WIDGET_SET_FLAGS (network_cancel, GTK_CAN_DEFAULT);
 
-  gtk_signal_connect (GTK_OBJECT (network_broadcast_check), "toggled",
-                      GTK_SIGNAL_FUNC (GtkNetworkOpenBroadcast),
+  gtk_signal_connect (GTK_OBJECT (network_udp), "toggled",
+                      GTK_SIGNAL_FUNC (GtkNetworkOpenUDP),
                       "intf_network");
-  gtk_signal_connect (GTK_OBJECT (network_channel_check), "toggled",
+  gtk_signal_connect (GTK_OBJECT (network_multicast), "toggled",
+                      GTK_SIGNAL_FUNC (GtkNetworkOpenMulticast),
+                      "intf_network");
+  gtk_signal_connect (GTK_OBJECT (network_channel), "toggled",
                       GTK_SIGNAL_FUNC (GtkNetworkOpenChannel),
                       "intf_network");
+  gtk_signal_connect (GTK_OBJECT (network_http), "toggled",
+                      GTK_SIGNAL_FUNC (GtkNetworkOpenHTTP),
+                      "intf_network");
   gtk_signal_connect (GTK_OBJECT (network_ok), "clicked",
                       GTK_SIGNAL_FUNC (GtkNetworkOpenOk),
                       "intf_network");
@@ -1677,8 +1698,6 @@ create_intf_network (void)
                       GTK_SIGNAL_FUNC (GtkNetworkOpenCancel),
                       "intf_network");
 
-  gtk_object_set_data (GTK_OBJECT (intf_network), "tooltips", tooltips);
-
   return intf_network;
 }
 
index 2f72a268afb399835bef214664665d8acd6c5103..221c2d53d22bcb9d3796299c23e722d2f0828507 100644 (file)
@@ -1977,10 +1977,11 @@ http://www.videolan.org/</label>
       </child>
 
       <widget>
-       <class>GtkHBox</class>
-       <name>hbox6</name>
-       <homogeneous>False</homogeneous>
-       <spacing>5</spacing>
+       <class>GtkFrame</class>
+       <name>frame9</name>
+       <label>Network mode</label>
+       <label_xalign>0</label_xalign>
+       <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
        <child>
          <padding>0</padding>
          <expand>True</expand>
@@ -1988,325 +1989,311 @@ http://www.videolan.org/</label>
        </child>
 
        <widget>
-         <class>GtkFrame</class>
-         <name>frame4</name>
-         <label>Protocol</label>
-         <label_xalign>0</label_xalign>
-         <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-         <child>
-           <padding>0</padding>
-           <expand>True</expand>
-           <fill>True</fill>
-         </child>
+         <class>GtkTable</class>
+         <name>table4</name>
+         <border_width>9</border_width>
+         <rows>4</rows>
+         <columns>6</columns>
+         <homogeneous>False</homogeneous>
+         <row_spacing>0</row_spacing>
+         <column_spacing>6</column_spacing>
 
          <widget>
-           <class>GtkVBox</class>
-           <name>vbox9</name>
-           <homogeneous>False</homogeneous>
-           <spacing>0</spacing>
-
-           <widget>
-             <class>GtkRadioButton</class>
-             <name>network_ts</name>
-             <can_focus>True</can_focus>
-             <label>TS</label>
-             <active>False</active>
-             <draw_indicator>True</draw_indicator>
-             <group>network</group>
-             <child>
-               <padding>0</padding>
-               <expand>False</expand>
-               <fill>False</fill>
-             </child>
-           </widget>
+           <class>GtkRadioButton</class>
+           <name>network_udp</name>
+           <can_focus>True</can_focus>
+           <signal>
+             <name>toggled</name>
+             <handler>GtkNetworkOpenUDP</handler>
+             <data>&quot;intf_network&quot;</data>
+             <last_modification_time>Thu, 16 May 2002 00:47:18 GMT</last_modification_time>
+           </signal>
+           <label>UDP</label>
+           <active>False</active>
+           <draw_indicator>True</draw_indicator>
+           <child>
+             <left_attach>0</left_attach>
+             <right_attach>1</right_attach>
+             <top_attach>0</top_attach>
+             <bottom_attach>1</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_rtp</name>
-             <sensitive>False</sensitive>
-             <can_focus>True</can_focus>
-             <label>RTP</label>
-             <active>False</active>
-             <draw_indicator>True</draw_indicator>
-             <group>network</group>
-             <child>
-               <padding>0</padding>
-               <expand>False</expand>
-               <fill>False</fill>
-             </child>
-           </widget>
+         <widget>
+           <class>GtkRadioButton</class>
+           <name>network_multicast</name>
+           <can_focus>True</can_focus>
+           <signal>
+             <name>toggled</name>
+             <handler>GtkNetworkOpenMulticast</handler>
+             <data>&quot;intf_network&quot;</data>
+             <last_modification_time>Thu, 16 May 2002 00:47:05 GMT</last_modification_time>
+           </signal>
+           <label>UDP Multicast</label>
+           <active>False</active>
+           <draw_indicator>True</draw_indicator>
+           <child>
+             <left_attach>0</left_attach>
+             <right_attach>1</right_attach>
+             <top_attach>1</top_attach>
+             <bottom_attach>2</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>
-             <can_focus>True</can_focus>
-             <label>HTTP</label>
-             <active>False</active>
-             <draw_indicator>True</draw_indicator>
-             <group>network</group>
-             <child>
-               <padding>0</padding>
-               <expand>False</expand>
-               <fill>False</fill>
-             </child>
-           </widget>
+         <widget>
+           <class>GtkRadioButton</class>
+           <name>network_channel</name>
+           <can_focus>True</can_focus>
+           <signal>
+             <name>toggled</name>
+             <handler>GtkNetworkOpenChannel</handler>
+             <data>&quot;intf_network&quot;</data>
+             <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>
 
-       <widget>
-         <class>GtkFrame</class>
-         <name>frame5</name>
-         <label>Server</label>
-         <label_xalign>0</label_xalign>
-         <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-         <child>
-           <padding>0</padding>
-           <expand>True</expand>
-           <fill>True</fill>
-         </child>
+         <widget>
+           <class>GtkRadioButton</class>
+           <name>network_http</name>
+           <can_focus>True</can_focus>
+           <signal>
+             <name>toggled</name>
+             <handler>GtkNetworkOpenHTTP</handler>
+             <data>&quot;intf_network&quot;</data>
+             <last_modification_time>Thu, 16 May 2002 00:47:42 GMT</last_modification_time>
+           </signal>
+           <label>HTTP</label>
+           <active>False</active>
+           <draw_indicator>True</draw_indicator>
+           <child>
+             <left_attach>0</left_attach>
+             <right_attach>1</right_attach>
+             <top_attach>3</top_attach>
+             <bottom_attach>4</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>GtkTable</class>
-           <name>table2</name>
-           <border_width>5</border_width>
-           <rows>3</rows>
-           <columns>2</columns>
-           <homogeneous>False</homogeneous>
-           <row_spacing>5</row_spacing>
-           <column_spacing>5</column_spacing>
+           <class>GtkLabel</class>
+           <name>network_udp_port_label</name>
+           <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>1</left_attach>
+             <right_attach>2</right_attach>
+             <top_attach>0</top_attach>
+             <bottom_attach>1</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_port</name>
-             <can_focus>True</can_focus>
-             <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>1234</value>
-             <lower>0</lower>
-             <upper>65535</upper>
-             <step>1</step>
-             <page>10</page>
-             <page_size>10</page_size>
-             <child>
-               <left_attach>1</left_attach>
-               <right_attach>2</right_attach>
-               <top_attach>1</top_attach>
-               <bottom_attach>2</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>GtkLabel</class>
+           <name>network_multicast_address_label</name>
+           <sensitive>False</sensitive>
+           <label>Address</label>
+           <justify>GTK_JUSTIFY_RIGHT</justify>
+           <wrap>False</wrap>
+           <xalign>1</xalign>
+           <yalign>0.5</yalign>
+           <xpad>0</xpad>
+           <ypad>0</ypad>
+           <child>
+             <left_attach>1</left_attach>
+             <right_attach>2</right_attach>
+             <top_attach>1</top_attach>
+             <bottom_attach>2</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_port_label</name>
-             <label>Port</label>
-             <justify>GTK_JUSTIFY_CENTER</justify>
-             <wrap>False</wrap>
-             <xalign>0</xalign>
-             <yalign>0.5</yalign>
+         <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>
-             <child>
-               <left_attach>0</left_attach>
-               <right_attach>1</right_attach>
-               <top_attach>1</top_attach>
-               <bottom_attach>2</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>
+             <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_server_label</name>
-             <label>Address</label>
-             <justify>GTK_JUSTIFY_CENTER</justify>
-             <wrap>False</wrap>
-             <xalign>0</xalign>
-             <yalign>0.5</yalign>
+         <widget>
+           <class>GtkLabel</class>
+           <name>network_http_url_label</name>
+           <sensitive>False</sensitive>
+           <label>URL</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>1</left_attach>
+             <right_attach>2</right_attach>
+             <top_attach>3</top_attach>
+             <bottom_attach>4</bottom_attach>
              <xpad>0</xpad>
              <ypad>0</ypad>
-             <child>
-               <left_attach>0</left_attach>
-               <right_attach>1</right_attach>
-               <top_attach>0</top_attach>
-               <bottom_attach>1</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>
+             <xexpand>False</xexpand>
+             <yexpand>False</yexpand>
+             <xshrink>False</xshrink>
+             <yshrink>False</yshrink>
+             <xfill>True</xfill>
+             <yfill>False</yfill>
+           </child>
+         </widget>
 
-           <widget>
-             <class>GtkCheckButton</class>
-             <name>network_broadcast_check</name>
-             <can_focus>True</can_focus>
-             <signal>
-               <name>toggled</name>
-               <handler>GtkNetworkOpenBroadcast</handler>
-               <data>&quot;intf_network&quot;</data>
-               <last_modification_time>Sun, 13 May 2001 14:52:49 GMT</last_modification_time>
-             </signal>
-             <label>Broadcast</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>GtkCombo</class>
+           <name>combo1</name>
+           <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>1</top_attach>
+             <bottom_attach>2</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>GtkCombo</class>
-             <name>network_broadcast_combo</name>
+             <class>GtkEntry</class>
+             <child_name>GtkCombo:entry</child_name>
+             <name>network_multicast_address</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>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>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_broadcast</name>
-               <sensitive>False</sensitive>
-               <can_focus>True</can_focus>
-               <editable>True</editable>
-               <text_visible>True</text_visible>
-               <text_max_length>0</text_max_length>
-               <text>138.195.143.255</text>
-             </widget>
-           </widget>
-
-           <widget>
-             <class>GtkCombo</class>
-             <name>network_server_combo</name>
-             <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>vls
-</items>
-             <child>
-               <left_attach>1</left_attach>
-               <right_attach>2</right_attach>
-               <top_attach>0</top_attach>
-               <bottom_attach>1</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_server</name>
-               <can_focus>True</can_focus>
-               <editable>True</editable>
-               <text_visible>True</text_visible>
-               <text_max_length>0</text_max_length>
-               <text>vls</text>
-             </widget>
+             <can_focus>True</can_focus>
+             <editable>True</editable>
+             <text_visible>True</text_visible>
+             <text_max_length>0</text_max_length>
+             <text></text>
            </widget>
          </widget>
-       </widget>
-      </widget>
-
-      <widget>
-       <class>GtkFrame</class>
-       <name>frame6</name>
-       <label>Channels</label>
-       <label_xalign>0.05</label_xalign>
-       <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-       <child>
-         <padding>5</padding>
-         <expand>True</expand>
-         <fill>True</fill>
-       </child>
-
-       <widget>
-         <class>GtkHBox</class>
-         <name>hbox14</name>
-         <homogeneous>False</homogeneous>
-         <spacing>0</spacing>
 
          <widget>
-           <class>GtkCheckButton</class>
-           <name>network_channel_check</name>
+           <class>GtkSpinButton</class>
+           <name>network_udp_port</name>
+           <width>1</width>
            <can_focus>True</can_focus>
-           <signal>
-             <name>toggled</name>
-             <handler>GtkNetworkOpenChannel</handler>
-             <data>&quot;intf_network&quot;</data>
-             <last_modification_time>Wed, 30 May 2001 16:57:53 GMT</last_modification_time>
-           </signal>
-           <label>Channel server:</label>
-           <active>False</active>
-           <draw_indicator>True</draw_indicator>
+           <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>1234</value>
+           <lower>0</lower>
+           <upper>65535</upper>
+           <step>1</step>
+           <page>10</page>
+           <page_size>10</page_size>
            <child>
-             <padding>0</padding>
-             <expand>False</expand>
-             <fill>False</fill>
+             <left_attach>2</left_attach>
+             <right_attach>3</right_attach>
+             <top_attach>0</top_attach>
+             <bottom_attach>1</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>GtkCombo</class>
-           <name>network_channel_combo</name>
+           <name>combo2</name>
            <value_in_list>False</value_in_list>
            <ok_if_empty>True</ok_if_empty>
            <case_sensitive>False</case_sensitive>
@@ -2314,44 +2301,127 @@ http://www.videolan.org/</label>
            <use_arrows_always>False</use_arrows_always>
            <items></items>
            <child>
-             <padding>0</padding>
-             <expand>True</expand>
-             <fill>True</fill>
+             <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</name>
+             <name>network_channel_address</name>
+             <sensitive>False</sensitive>
              <can_focus>True</can_focus>
              <editable>True</editable>
              <text_visible>True</text_visible>
              <text_max_length>0</text_max_length>
-             <text>138.195.143.120</text>
+             <text></text>
            </widget>
          </widget>
 
+         <widget>
+           <class>GtkLabel</class>
+           <name>network_multicast_port_label</name>
+           <width>51</width>
+           <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>1</top_attach>
+             <bottom_attach>2</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_channel_port_label</name>
-           <label>port:</label>
+           <sensitive>False</sensitive>
+           <label>Port</label>
            <justify>GTK_JUSTIFY_CENTER</justify>
            <wrap>False</wrap>
-           <xalign>0.5</xalign>
+           <xalign>1</xalign>
            <yalign>0.5</yalign>
            <xpad>0</xpad>
            <ypad>0</ypad>
            <child>
-             <padding>5</padding>
-             <expand>False</expand>
-             <fill>False</fill>
+             <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>
+           <width>75</width>
+           <sensitive>False</sensitive>
+           <can_focus>True</can_focus>
+           <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>1234</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>1</top_attach>
+             <bottom_attach>2</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>GtkSpinButton</class>
            <name>network_channel_port</name>
-           <width>62</width>
+           <width>75</width>
+           <sensitive>False</sensitive>
            <can_focus>True</can_focus>
            <climb_rate>1</climb_rate>
            <digits>0</digits>
@@ -2360,15 +2430,75 @@ http://www.videolan.org/</label>
            <snap>False</snap>
            <wrap>False</wrap>
            <value>6010</value>
-           <lower>1024</lower>
-           <upper>100</upper>
+           <lower>0</lower>
+           <upper>65535</upper>
            <step>1</step>
            <page>10</page>
            <page_size>10</page_size>
            <child>
-             <padding>0</padding>
-             <expand>True</expand>
-             <fill>True</fill>
+             <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>
+           <sensitive>False</sensitive>
+           <can_focus>True</can_focus>
+           <editable>True</editable>
+           <text_visible>True</text_visible>
+           <text_max_length>0</text_max_length>
+           <text></text>
+           <child>
+             <left_attach>2</left_attach>
+             <right_attach>6</right_attach>
+             <top_attach>3</top_attach>
+             <bottom_attach>4</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>GtkLabel</class>
+           <name>label28</name>
+           <label></label>
+           <justify>GTK_JUSTIFY_CENTER</justify>
+           <wrap>False</wrap>
+           <xalign>0</xalign>
+           <yalign>0.5</yalign>
+           <xpad>0</xpad>
+           <ypad>0</ypad>
+           <child>
+             <left_attach>3</left_attach>
+             <right_attach>6</right_attach>
+             <top_attach>0</top_attach>
+             <bottom_attach>1</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>
index e9db38eb0f73cd79230fef666f694c3bbaaec5b4..6b895e1bd57db2d0839e5333e36bdd19fae10185 100644 (file)
@@ -2,7 +2,7 @@
  * gtk_callbacks.c : Callbacks for the Gtk+ plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_callbacks.c,v 1.38 2002/04/23 14:16:20 sam Exp $
+ * $Id: gtk_callbacks.c,v 1.39 2002/05/18 02:12:20 ipkiss Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -608,4 +608,3 @@ GtkMessagesDelete                      (GtkWidget       *widget,
     return TRUE;
 }
 
-
index 0f293f029f2690ed079a81f650e0fd7cf715313a..0890aebbae2755fb79e944642019cae0c400e5d2 100644 (file)
@@ -2,7 +2,7 @@
  * gtk_callbacks.h : Callbacks for the gtk plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_callbacks.h,v 1.18 2002/03/25 02:06:24 jobi Exp $
+ * $Id: gtk_callbacks.h,v 1.19 2002/05/18 02:12:20 ipkiss Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -106,3 +106,27 @@ GtkSatOpenOk                           (GtkButton       *button,
 void
 GtkSatOpenCancel                       (GtkButton       *button,
                                         gpointer         user_data);
+
+void
+GtkNetworkOpenUDP                      (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+void
+GtkNetworkOpenMulticast                (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+void
+GtkNetworkOpenCS                       (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+void
+GtkNetworkOpenHTTP                     (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+void
+GtkNetworkOpenChannel                  (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
+
+void
+GtkNetworkOpenChannel                  (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
index 4286e5fd356fa99e02a0e1430b54168a62082cc1..e27d94b4021fe9dd99edb02da349d84b4433366f 100644 (file)
@@ -1,6 +1,10 @@
-/* This file was created automatically by glade and fixed by fixfiles.sh */
+/*
+ * NE PAS ÉDITER CE FICHIER - il est généré par Glade.
+ */
 
-#include <videolan/vlc.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -1592,7 +1596,7 @@ create_intf_disc (void)
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (disc_name);
   gtk_box_pack_start (GTK_BOX (hbox2), disc_name, TRUE, TRUE, 0);
-  gtk_entry_set_text (GTK_ENTRY (disc_name), config_GetPszVariable( "dvd" ));
+  gtk_entry_set_text (GTK_ENTRY (disc_name), _("/dev/dvd"));
 
   dialog_action_area1 = GTK_DIALOG (intf_disc)->action_area;
   gtk_object_set_data (GTK_OBJECT (intf_disc), "dialog_action_area1", dialog_action_area1);
@@ -1642,33 +1646,31 @@ create_intf_network (void)
   GtkWidget *intf_network;
   GtkWidget *vbox7;
   GtkWidget *vbox8;
-  GtkWidget *hbox6;
-  GtkWidget *frame4;
-  GtkWidget *vbox9;
-  GSList *network_group = NULL;
-  GtkWidget *network_ts;
-  GtkWidget *network_rtp;
-  GtkWidget *network_http;
-  GtkWidget *frame5;
-  GtkWidget *table2;
-  GtkObject *network_port_adj;
-  GtkWidget *network_port;
-  GtkWidget *network_port_label;
-  GtkWidget *network_server_label;
-  GtkWidget *network_broadcast_check;
-  GtkWidget *network_broadcast_combo;
-  GtkWidget *network_broadcast;
-  GtkWidget *network_server_combo;
-  GList *network_server_combo_items = NULL;
-  GtkWidget *network_server;
-  GtkWidget *frame6;
-  GtkWidget *hbox14;
-  GtkWidget *network_channel_check;
-  GtkWidget *network_channel_combo;
+  GtkWidget *frame9;
+  GtkWidget *table4;
+  GSList *table4_group = NULL;
+  GtkWidget *network_udp;
+  GtkWidget *network_multicast;
   GtkWidget *network_channel;
+  GtkWidget *network_http;
+  GtkWidget *network_udp_port_label;
+  GtkWidget *network_multicast_address_label;
+  GtkWidget *network_channel_address_label;
+  GtkWidget *network_http_url_label;
+  GtkWidget *combo1;
+  GtkWidget *network_multicast_address;
+  GtkObject *network_udp_port_adj;
+  GtkWidget *network_udp_port;
+  GtkWidget *combo2;
+  GtkWidget *network_channel_address;
+  GtkWidget *network_multicast_port_label;
   GtkWidget *network_channel_port_label;
+  GtkObject *network_multicast_port_adj;
+  GtkWidget *network_multicast_port;
   GtkObject *network_channel_port_adj;
   GtkWidget *network_channel_port;
+  GtkWidget *network_http_url;
+  GtkWidget *label28;
   GtkWidget *hbox4;
   GtkWidget *hbox5;
   GtkWidget *network_ok;
@@ -1693,196 +1695,214 @@ create_intf_network (void)
   gtk_box_pack_start (GTK_BOX (vbox7), vbox8, TRUE, TRUE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox8), 5);
 
-  hbox6 = gtk_hbox_new (FALSE, 5);
-  gtk_widget_ref (hbox6);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "hbox6", hbox6,
+  frame9 = gtk_frame_new (_("Network mode"));
+  gtk_widget_ref (frame9);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "frame9", frame9,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (hbox6);
-  gtk_box_pack_start (GTK_BOX (vbox8), hbox6, TRUE, TRUE, 0);
+  gtk_widget_show (frame9);
+  gtk_box_pack_start (GTK_BOX (vbox8), frame9, TRUE, TRUE, 0);
 
-  frame4 = gtk_frame_new (_("Protocol"));
-  gtk_widget_ref (frame4);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "frame4", frame4,
+  table4 = gtk_table_new (4, 6, FALSE);
+  gtk_widget_ref (table4);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "table4", table4,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (frame4);
-  gtk_box_pack_start (GTK_BOX (hbox6), frame4, TRUE, TRUE, 0);
+  gtk_widget_show (table4);
+  gtk_container_add (GTK_CONTAINER (frame9), table4);
+  gtk_container_set_border_width (GTK_CONTAINER (table4), 9);
+  gtk_table_set_col_spacings (GTK_TABLE (table4), 6);
 
-  vbox9 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox9);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "vbox9", vbox9,
+  network_udp = gtk_radio_button_new_with_label (table4_group, _("UDP"));
+  table4_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_udp));
+  gtk_widget_ref (network_udp);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_udp", network_udp,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (vbox9);
-  gtk_container_add (GTK_CONTAINER (frame4), vbox9);
+  gtk_widget_show (network_udp);
+  gtk_table_attach (GTK_TABLE (table4), network_udp, 0, 1, 0, 1,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
 
-  network_ts = gtk_radio_button_new_with_label (network_group, _("TS"));
-  network_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_ts));
-  gtk_widget_ref (network_ts);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_ts", network_ts,
+  network_multicast = gtk_radio_button_new_with_label (table4_group, _("UDP Multicast"));
+  table4_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_multicast));
+  gtk_widget_ref (network_multicast);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_multicast", network_multicast,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_ts);
-  gtk_box_pack_start (GTK_BOX (vbox9), network_ts, FALSE, FALSE, 0);
+  gtk_widget_show (network_multicast);
+  gtk_table_attach (GTK_TABLE (table4), network_multicast, 0, 1, 1, 2,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
 
-  network_rtp = gtk_radio_button_new_with_label (network_group, _("RTP"));
-  network_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_rtp));
-  gtk_widget_ref (network_rtp);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_rtp", network_rtp,
+  network_channel = gtk_radio_button_new_with_label (table4_group, _("Channel server "));
+  table4_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_channel));
+  gtk_widget_ref (network_channel);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel", network_channel,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_rtp);
-  gtk_box_pack_start (GTK_BOX (vbox9), network_rtp, FALSE, FALSE, 0);
-  gtk_widget_set_sensitive (network_rtp, FALSE);
+  gtk_widget_show (network_channel);
+  gtk_table_attach (GTK_TABLE (table4), network_channel, 0, 1, 2, 3,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
 
-  network_http = gtk_radio_button_new_with_label (network_group, _("HTTP"));
-  network_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_http));
+  network_http = gtk_radio_button_new_with_label (table4_group, _("HTTP"));
+  table4_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_http));
   gtk_widget_ref (network_http);
   gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_http", network_http,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (network_http);
-  gtk_box_pack_start (GTK_BOX (vbox9), network_http, FALSE, FALSE, 0);
-
-  frame5 = gtk_frame_new (_("Server"));
-  gtk_widget_ref (frame5);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "frame5", frame5,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (frame5);
-  gtk_box_pack_start (GTK_BOX (hbox6), frame5, TRUE, TRUE, 0);
-
-  table2 = gtk_table_new (3, 2, FALSE);
-  gtk_widget_ref (table2);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "table2", table2,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (table2);
-  gtk_container_add (GTK_CONTAINER (frame5), table2);
-  gtk_container_set_border_width (GTK_CONTAINER (table2), 5);
-  gtk_table_set_row_spacings (GTK_TABLE (table2), 5);
-  gtk_table_set_col_spacings (GTK_TABLE (table2), 5);
-
-  network_port_adj = gtk_adjustment_new (1234, 0, 65535, 1, 10, 10);
-  network_port = gtk_spin_button_new (GTK_ADJUSTMENT (network_port_adj), 1, 0);
-  gtk_widget_ref (network_port);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_port", network_port,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_port);
-  gtk_table_attach (GTK_TABLE (table2), network_port, 1, 2, 1, 2,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+  gtk_table_attach (GTK_TABLE (table4), network_http, 0, 1, 3, 4,
+                    (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
 
-  network_port_label = gtk_label_new (_("Port"));
-  gtk_widget_ref (network_port_label);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_port_label", network_port_label,
+  network_udp_port_label = gtk_label_new (_("Port"));
+  gtk_widget_ref (network_udp_port_label);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_udp_port_label", network_udp_port_label,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_port_label);
-  gtk_table_attach (GTK_TABLE (table2), network_port_label, 0, 1, 1, 2,
+  gtk_widget_show (network_udp_port_label);
+  gtk_table_attach (GTK_TABLE (table4), network_udp_port_label, 1, 2, 0, 1,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (network_port_label), 0, 0.5);
+  gtk_misc_set_alignment (GTK_MISC (network_udp_port_label), 1, 0.5);
 
-  network_server_label = gtk_label_new (_("Address"));
-  gtk_widget_ref (network_server_label);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_server_label", network_server_label,
+  network_multicast_address_label = gtk_label_new (_("Address"));
+  gtk_widget_ref (network_multicast_address_label);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_multicast_address_label", network_multicast_address_label,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_server_label);
-  gtk_table_attach (GTK_TABLE (table2), network_server_label, 0, 1, 0, 1,
+  gtk_widget_show (network_multicast_address_label);
+  gtk_table_attach (GTK_TABLE (table4), network_multicast_address_label, 1, 2, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (network_server_label), 0, 0.5);
+  gtk_widget_set_sensitive (network_multicast_address_label, FALSE);
+  gtk_label_set_justify (GTK_LABEL (network_multicast_address_label), GTK_JUSTIFY_RIGHT);
+  gtk_misc_set_alignment (GTK_MISC (network_multicast_address_label), 1, 0.5);
 
-  network_broadcast_check = gtk_check_button_new_with_label (_("Broadcast"));
-  gtk_widget_ref (network_broadcast_check);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_broadcast_check", network_broadcast_check,
+  network_channel_address_label = gtk_label_new (_("Address"));
+  gtk_widget_ref (network_channel_address_label);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_address_label", network_channel_address_label,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_broadcast_check);
-  gtk_table_attach (GTK_TABLE (table2), network_broadcast_check, 0, 1, 2, 3,
+  gtk_widget_show (network_channel_address_label);
+  gtk_table_attach (GTK_TABLE (table4), network_channel_address_label, 1, 2, 2, 3,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_sensitive (network_channel_address_label, FALSE);
 
-  network_broadcast_combo = gtk_combo_new ();
-  gtk_widget_ref (network_broadcast_combo);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_broadcast_combo", network_broadcast_combo,
+  network_http_url_label = gtk_label_new (_("URL"));
+  gtk_widget_ref (network_http_url_label);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_http_url_label", network_http_url_label,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_broadcast_combo);
-  gtk_table_attach (GTK_TABLE (table2), network_broadcast_combo, 1, 2, 2, 3,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+  gtk_widget_show (network_http_url_label);
+  gtk_table_attach (GTK_TABLE (table4), network_http_url_label, 1, 2, 3, 4,
+                    (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_widget_set_sensitive (network_broadcast_combo, FALSE);
-
-  network_broadcast = GTK_COMBO (network_broadcast_combo)->entry;
-  gtk_widget_ref (network_broadcast);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_broadcast", network_broadcast,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_broadcast);
-  gtk_widget_set_sensitive (network_broadcast, FALSE);
-  gtk_entry_set_text (GTK_ENTRY (network_broadcast), _("138.195.143.255"));
+  gtk_widget_set_sensitive (network_http_url_label, FALSE);
+  gtk_misc_set_alignment (GTK_MISC (network_http_url_label), 1, 0.5);
 
-  network_server_combo = gtk_combo_new ();
-  gtk_widget_ref (network_server_combo);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_server_combo", network_server_combo,
+  combo1 = gtk_combo_new ();
+  gtk_widget_ref (combo1);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "combo1", combo1,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_server_combo);
-  gtk_table_attach (GTK_TABLE (table2), network_server_combo, 1, 2, 0, 1,
+  gtk_widget_show (combo1);
+  gtk_table_attach (GTK_TABLE (table4), combo1, 2, 4, 1, 2,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  network_server_combo_items = g_list_append (network_server_combo_items, (gpointer) _("vls"));
-  gtk_combo_set_popdown_strings (GTK_COMBO (network_server_combo), network_server_combo_items);
-  g_list_free (network_server_combo_items);
 
-  network_server = GTK_COMBO (network_server_combo)->entry;
-  gtk_widget_ref (network_server);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_server", network_server,
+  network_multicast_address = GTK_COMBO (combo1)->entry;
+  gtk_widget_ref (network_multicast_address);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_multicast_address", network_multicast_address,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_server);
-  gtk_entry_set_text (GTK_ENTRY (network_server), _("vls"));
+  gtk_widget_show (network_multicast_address);
+  gtk_widget_set_sensitive (network_multicast_address, FALSE);
 
-  frame6 = gtk_frame_new (_("Channels"));
-  gtk_widget_ref (frame6);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "frame6", frame6,
+  network_udp_port_adj = gtk_adjustment_new (1234, 0, 65535, 1, 10, 10);
+  network_udp_port = gtk_spin_button_new (GTK_ADJUSTMENT (network_udp_port_adj), 1, 0);
+  gtk_widget_ref (network_udp_port);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_udp_port", network_udp_port,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (frame6);
-  gtk_box_pack_start (GTK_BOX (vbox8), frame6, TRUE, TRUE, 5);
-  gtk_frame_set_label_align (GTK_FRAME (frame6), 0.05, 0.5);
-
-  hbox14 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref (hbox14);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "hbox14", hbox14,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (hbox14);
-  gtk_container_add (GTK_CONTAINER (frame6), hbox14);
+  gtk_widget_show (network_udp_port);
+  gtk_table_attach (GTK_TABLE (table4), network_udp_port, 2, 3, 0, 1,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_usize (network_udp_port, 1, -2);
 
-  network_channel_check = gtk_check_button_new_with_label (_("Channel server:"));
-  gtk_widget_ref (network_channel_check);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_check", network_channel_check,
+  combo2 = gtk_combo_new ();
+  gtk_widget_ref (combo2);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "combo2", combo2,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_channel_check);
-  gtk_box_pack_start (GTK_BOX (hbox14), network_channel_check, FALSE, FALSE, 0);
+  gtk_widget_show (combo2);
+  gtk_table_attach (GTK_TABLE (table4), combo2, 2, 4, 2, 3,
+                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
 
-  network_channel_combo = gtk_combo_new ();
-  gtk_widget_ref (network_channel_combo);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_combo", network_channel_combo,
+  network_channel_address = GTK_COMBO (combo2)->entry;
+  gtk_widget_ref (network_channel_address);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_address", network_channel_address,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_channel_combo);
-  gtk_box_pack_start (GTK_BOX (hbox14), network_channel_combo, TRUE, TRUE, 0);
+  gtk_widget_show (network_channel_address);
+  gtk_widget_set_sensitive (network_channel_address, FALSE);
 
-  network_channel = GTK_COMBO (network_channel_combo)->entry;
-  gtk_widget_ref (network_channel);
-  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel", network_channel,
+  network_multicast_port_label = gtk_label_new (_("Port"));
+  gtk_widget_ref (network_multicast_port_label);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_multicast_port_label", network_multicast_port_label,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (network_channel);
-  gtk_entry_set_text (GTK_ENTRY (network_channel), _("138.195.143.120"));
+  gtk_widget_show (network_multicast_port_label);
+  gtk_table_attach (GTK_TABLE (table4), network_multicast_port_label, 4, 5, 1, 2,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_usize (network_multicast_port_label, 51, -2);
+  gtk_widget_set_sensitive (network_multicast_port_label, FALSE);
+  gtk_misc_set_alignment (GTK_MISC (network_multicast_port_label), 1, 0.5);
 
-  network_channel_port_label = gtk_label_new (_("port:"));
+  network_channel_port_label = gtk_label_new (_("Port"));
   gtk_widget_ref (network_channel_port_label);
   gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_port_label", network_channel_port_label,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (network_channel_port_label);
-  gtk_box_pack_start (GTK_BOX (hbox14), network_channel_port_label, FALSE, FALSE, 5);
+  gtk_table_attach (GTK_TABLE (table4), network_channel_port_label, 4, 5, 2, 3,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_sensitive (network_channel_port_label, FALSE);
+  gtk_misc_set_alignment (GTK_MISC (network_channel_port_label), 1, 0.5);
+
+  network_multicast_port_adj = gtk_adjustment_new (1234, 0, 65535, 1, 10, 10);
+  network_multicast_port = gtk_spin_button_new (GTK_ADJUSTMENT (network_multicast_port_adj), 1, 0);
+  gtk_widget_ref (network_multicast_port);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_multicast_port", network_multicast_port,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (network_multicast_port);
+  gtk_table_attach (GTK_TABLE (table4), network_multicast_port, 5, 6, 1, 2,
+                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_usize (network_multicast_port, 75, -2);
+  gtk_widget_set_sensitive (network_multicast_port, FALSE);
 
-  network_channel_port_adj = gtk_adjustment_new (6010, 1024, 100, 1, 10, 10);
+  network_channel_port_adj = gtk_adjustment_new (6010, 0, 65535, 1, 10, 10);
   network_channel_port = gtk_spin_button_new (GTK_ADJUSTMENT (network_channel_port_adj), 1, 0);
   gtk_widget_ref (network_channel_port);
   gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_channel_port", network_channel_port,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (network_channel_port);
-  gtk_box_pack_start (GTK_BOX (hbox14), network_channel_port, TRUE, TRUE, 0);
-  gtk_widget_set_usize (network_channel_port, 62, -2);
+  gtk_table_attach (GTK_TABLE (table4), network_channel_port, 5, 6, 2, 3,
+                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_usize (network_channel_port, 75, -2);
+  gtk_widget_set_sensitive (network_channel_port, FALSE);
+
+  network_http_url = gtk_entry_new ();
+  gtk_widget_ref (network_http_url);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "network_http_url", network_http_url,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (network_http_url);
+  gtk_table_attach (GTK_TABLE (table4), network_http_url, 2, 6, 3, 4,
+                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_widget_set_sensitive (network_http_url, FALSE);
+
+  label28 = gtk_label_new ("");
+  gtk_widget_ref (label28);
+  gtk_object_set_data_full (GTK_OBJECT (intf_network), "label28", label28,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (label28);
+  gtk_table_attach (GTK_TABLE (table4), label28, 3, 6, 0, 1,
+                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (label28), 0, 0.5);
 
   hbox4 = GTK_DIALOG (intf_network)->action_area;
   gtk_object_set_data (GTK_OBJECT (intf_network), "hbox4", hbox4);
@@ -1910,12 +1930,18 @@ create_intf_network (void)
   gtk_widget_show (network_cancel);
   gtk_box_pack_start (GTK_BOX (hbox5), network_cancel, FALSE, TRUE, 0);
 
-  gtk_signal_connect (GTK_OBJECT (network_broadcast_check), "toggled",
-                      GTK_SIGNAL_FUNC (GtkNetworkOpenBroadcast),
+  gtk_signal_connect (GTK_OBJECT (network_udp), "toggled",
+                      GTK_SIGNAL_FUNC (GtkNetworkOpenUDP),
+                      "intf_network");
+  gtk_signal_connect (GTK_OBJECT (network_multicast), "toggled",
+                      GTK_SIGNAL_FUNC (GtkNetworkOpenMulticast),
                       "intf_network");
-  gtk_signal_connect (GTK_OBJECT (network_channel_check), "toggled",
+  gtk_signal_connect (GTK_OBJECT (network_channel), "toggled",
                       GTK_SIGNAL_FUNC (GtkNetworkOpenChannel),
                       "intf_network");
+  gtk_signal_connect (GTK_OBJECT (network_http), "toggled",
+                      GTK_SIGNAL_FUNC (GtkNetworkOpenHTTP),
+                      "intf_network");
   gtk_signal_connect (GTK_OBJECT (network_ok), "clicked",
                       GTK_SIGNAL_FUNC (GtkNetworkOpenOk),
                       "intf_network");
index 5166276f343bfb263ea479ff97cc9e9b32d2d5df..132f15c9bc02eba38cc987dc226c256a29617a10 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
+ * NE PAS ÉDITER CE FICHIER - il est généré par Glade.
  */
 
 GtkWidget* create_intf_window (void);
index 8404fdb9f55832a4934f5dcd70f725471e5d42dc..b5443af8799bf04d8a596e3d157841251404096c 100644 (file)
@@ -2,7 +2,7 @@
  * gtk_open.c : functions to handle file/disc/network open widgets.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_open.c,v 1.23 2002/04/23 14:16:20 sam Exp $
+ * $Id: gtk_open.c,v 1.24 2002/05/18 02:12:20 ipkiss Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -271,13 +271,13 @@ gboolean GtkNetworkOpenShow( GtkWidget       *widget,
                              "p_intf", p_intf );
 
         gtk_spin_button_set_value( GTK_SPIN_BUTTON( gtk_object_get_data(
-            GTK_OBJECT( p_intf->p_sys->p_network ), "network_port" ) ),
+            GTK_OBJECT( p_intf->p_sys->p_network ), "network_udp_port" ) ),
             config_GetIntVariable( "server-port" ) );
 
         psz_channel_server = config_GetPszVariable( "channel-server" );
         if( psz_channel_server )
             gtk_entry_set_text( GTK_ENTRY( gtk_object_get_data(
-                GTK_OBJECT( p_intf->p_sys->p_network ), "network_channel" ) ),
+                GTK_OBJECT( p_intf->p_sys->p_network ), "network_channel_address" ) ),
                 psz_channel_server );
         if( psz_channel_server ) free( psz_channel_server );
 
@@ -286,7 +286,7 @@ gboolean GtkNetworkOpenShow( GtkWidget       *widget,
             config_GetIntVariable( "channel-port" ) );
 
         gtk_toggle_button_set_active( gtk_object_get_data( GTK_OBJECT(
-            p_intf->p_sys->p_network ), "network_channel_check" ),
+            p_intf->p_sys->p_network ), "network_channel" ),
             config_GetIntVariable( "network-channel" ) );
     }
 
@@ -301,15 +301,14 @@ void GtkNetworkOpenOk( GtkButton *button, gpointer user_data )
 {
     intf_thread_t * p_intf = GetIntf( GTK_WIDGET(button), "intf_network" );
     GtkCList *      p_playlist_clist;
-    char *          psz_source, *psz_server, *psz_protocol;
+    char *          psz_source, *psz_address;
     unsigned int    i_port;
-    boolean_t       b_broadcast;
     boolean_t       b_channel;
     int             i_end = p_main->p_playlist->i_size;
 
     gtk_widget_hide( p_intf->p_sys->p_network );
-    psz_server = gtk_entry_get_text( GTK_ENTRY( lookup_widget(
-                                 GTK_WIDGET(button), "network_server" ) ) );
+//    psz_server = gtk_entry_get_text( GTK_ENTRY( lookup_widget(
+//                                 GTK_WIDGET(button), "network_server" ) ) );
 
     /* select added item */
     if( p_input_bank->pp_input[0] != NULL )
@@ -317,28 +316,95 @@ void GtkNetworkOpenOk( GtkButton *button, gpointer user_data )
         p_input_bank->pp_input[0]->b_eof = 1;
     }
 
-    /* Check which protocol was activated */
+    /* Manage channel server */
+    b_channel = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(
+            lookup_widget( GTK_WIDGET(button), "network_channel" ) ) );
+    config_PutIntVariable( "network-channel", b_channel );
+
+    /* Check which option was chosen */
+    /* UDP */
     if( GTK_TOGGLE_BUTTON( lookup_widget( GTK_WIDGET(button),
-                                          "network_ts" ) )->active )
+                                          "network_udp" ) )->active )
     {
-        psz_protocol = "udpstream";
+        /* No address in UDP mode */
+        psz_address = "";
+
+        /* Get the port number and make sure it will not
+         * overflow 5 characters */
+        i_port = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(
+             lookup_widget( GTK_WIDGET(button), "network_udp_port" ) ) );
+        if( i_port > 65535 )
+        {
+            intf_ErrMsg( "intf error: invalid port %i", i_port );
+        }
+        /* Allocate room for "protocol:@:port" */
+        psz_source = malloc( 5 /* "udp:@" */ + 1 /* ":" */
+                             + 5 /* 0-65535 */ + 1 /* "\0" */ );
+        if( psz_source == NULL )
+        {
+            return;
+        }
+
+        /* Build source name and add it to playlist */
+        sprintf( psz_source, "udp:@:%i", i_port );
+
+        intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, psz_source );
+        free( psz_source );
+
+        /* catch the GTK CList */
+        p_playlist_clist = GTK_CLIST( gtk_object_get_data(
+            GTK_OBJECT( p_intf->p_sys->p_playlist ), "playlist_clist" ) );
+        /* update the display */
+        GtkRebuildCList( p_playlist_clist, p_main->p_playlist );
+
+        intf_PlaylistJumpto( p_main->p_playlist, i_end - 1 );
     }
+
+    /* UDP Multicast */
     else if( GTK_TOGGLE_BUTTON( lookup_widget( GTK_WIDGET(button),
-                                               "network_rtp" ) )->active )
+                                               "network_multicast" ) )->active )
     {
-        psz_protocol = "rtp";
-    }
-    else
-    {
-        intf_ErrMsg( "intf error: unknown protocol toggle button position" );
-        return;
-    }
+        /* get the address */
+        psz_address = gtk_entry_get_text( GTK_ENTRY( lookup_widget(
+                        GTK_WIDGET(button), "network_multicast_address" ) ) );
+        /* Get the port number and make sure it will not
+         * overflow 5 characters */
+        i_port = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(
+             lookup_widget( GTK_WIDGET(button), "network_multicast_port" ) ) );
+        if( i_port > 65535 )
+        {
+            intf_ErrMsg( "intf error: invalid port %i", i_port );
+        }
+        /* Allocate room for "protocol:@address:port" */
+        psz_source = malloc( 5 /* "udp:@" */
+                             + strlen( psz_address ) + 1 /* ":" */
+                             + 5 /* 0-65535 */ + 1 /* "\0" */ );
+        if( psz_source == NULL )
+        {
+            return;
+        }
 
-    /* Manage channel server */
-    b_channel = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(
-        lookup_widget( GTK_WIDGET(button), "network_channel_check" ) ) );
-    config_PutIntVariable( "network-channel", b_channel );
-    if( b_channel )
+        /* Build source name and add it to playlist */
+        sprintf( psz_source, "udp:@%s:%i", psz_address, i_port );
+
+        intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, psz_source );
+        free( psz_source );
+
+        /* catch the GTK CList */
+        p_playlist_clist = GTK_CLIST( gtk_object_get_data(
+            GTK_OBJECT( p_intf->p_sys->p_playlist ), "playlist_clist" ) );
+        /* update the display */
+        GtkRebuildCList( p_playlist_clist, p_main->p_playlist );
+
+        intf_PlaylistJumpto( p_main->p_playlist, i_end - 1 );
+    }
+    
+    /* Channel server */
+    else if( GTK_TOGGLE_BUTTON( lookup_widget( GTK_WIDGET(button),
+                                               "network_channel" ) )->active )
     {
         char *          psz_channel;
         unsigned int    i_channel_port;
@@ -349,7 +415,7 @@ void GtkNetworkOpenOk( GtkButton *button, gpointer user_data )
         }
 
         psz_channel = gtk_entry_get_text( GTK_ENTRY( lookup_widget(
-                             GTK_WIDGET(button), "network_channel" ) ) );
+                        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" ) ) );
 
@@ -360,63 +426,30 @@ void GtkNetworkOpenOk( GtkButton *button, gpointer user_data )
         }
 
         p_intf->p_sys->b_playing = 1;
-
     }
-    else
+    
+    /* HTTP */
+    else if( GTK_TOGGLE_BUTTON( lookup_widget( GTK_WIDGET(button),
+                                               "network_http" ) )->active )
     {
-        /* Get the port number and make sure it will not
-         * overflow 5 characters */
-        i_port = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(
-                     lookup_widget( GTK_WIDGET(button), "network_port" ) ) );
-        if( i_port > 65535 )
+        /* get the url */
+        psz_address = gtk_entry_get_text( GTK_ENTRY( lookup_widget(
+                        GTK_WIDGET(button), "network_http_url" ) ) );
+
+        /* Allocate room for "protocol://url" */
+        psz_source = malloc( 7 /* "http://" */
+                             + strlen( psz_address ) + 1 /* "\0" */ );
+        if( psz_source == NULL )
         {
-            intf_ErrMsg( "intf error: invalid port %i", i_port );
+            return;
         }
 
-        /* do we have a broadcast address */
-        b_broadcast = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(
-            lookup_widget( GTK_WIDGET(button), "network_broadcast_check" ) ) );
-        if( b_broadcast )
-        {
-            char *  psz_broadcast;
-            psz_broadcast = gtk_entry_get_text( GTK_ENTRY( lookup_widget(
-                            GTK_WIDGET(button), "network_broadcast" ) ) );
-            /* Allocate room for "protocol://server:port" */
-            psz_source = malloc( strlen( psz_protocol ) + 3 /* "://" */
-                                   + strlen( psz_server ) + 2 /* "@:" */
-                                   + 5 /* 0-65535 */
-                                   + strlen( psz_broadcast ) + 2 /* "::" */ 
-                                   + 1 /* "\0" */ );
-            if( psz_source == NULL )
-            {
-                return;
-            }
-
-            /* Build source name and add it to playlist */
-            sprintf( psz_source, "%s://%s@:%i/%s", psz_protocol,
-                                                  psz_server,
-                                                  i_port,
-                                                  psz_broadcast );
-        }
-        else
-        {
-            /* Allocate room for "protocol://server:port" */
-            psz_source = malloc( strlen( psz_protocol ) + 3 /* "://" */
-                                   + strlen( psz_server ) + 2 /* "@:" */
-                                   + 5 /* 0-65535 */ + 1 /* "\0" */ );
-            if( psz_source == NULL )
-            {
-                return;
-            }
-           
-            /* Build source name and add it to playlist */
-            sprintf( psz_source, "%s://%s@:%i",
-                     psz_protocol, psz_server, i_port );
-        }
+        /* Build source name and add it to playlist */
+        sprintf( psz_source, "http://%s", psz_address );
 
         intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, psz_source );
         free( psz_source );
-        
+
         /* catch the GTK CList */
         p_playlist_clist = GTK_CLIST( gtk_object_get_data(
             GTK_OBJECT( p_intf->p_sys->p_playlist ), "playlist_clist" ) );
@@ -425,6 +458,18 @@ void GtkNetworkOpenOk( GtkButton *button, gpointer user_data )
 
         intf_PlaylistJumpto( p_main->p_playlist, i_end - 1 );
     }
+
+    /* This shouldn't occur */
+    else
+    {
+        intf_ErrMsg( "intf error: unknown protocol toggle button position" );
+        return;
+    }
+
+    /* add the item to the playlist if the channel server wasn't chosen */
+    if( !b_channel )
+    {
+    }
 }
 
 void GtkNetworkOpenCancel( GtkButton * button, gpointer user_data)
@@ -433,72 +478,81 @@ void GtkNetworkOpenCancel( GtkButton * button, gpointer user_data)
 }
 
 
-void GtkNetworkOpenBroadcast( GtkToggleButton * togglebutton,
-                              gpointer user_data )
+void GtkNetworkOpenUDP( GtkToggleButton *togglebutton,
+                                        gpointer user_data )
 {
     GtkWidget *     p_network;
 
     p_network = gtk_widget_get_toplevel( GTK_WIDGET (togglebutton) );
 
     gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_broadcast_combo" ),
-            gtk_toggle_button_get_active( togglebutton ) );
-
+                    "network_udp_port_label" ),
+                    gtk_toggle_button_get_active( togglebutton ) );
     gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_broadcast" ),
-            gtk_toggle_button_get_active( togglebutton ) );
+                    "network_udp_port" ),
+                    gtk_toggle_button_get_active( togglebutton ) );
 }
 
 
-void GtkNetworkOpenChannel( GtkToggleButton * togglebutton,
-                            gpointer user_data )
+void GtkNetworkOpenMulticast( GtkToggleButton *togglebutton,
+                                              gpointer user_data )
 {
     GtkWidget *     p_network;
-    boolean_t       b_channel;
-    boolean_t       b_broadcast;
 
     p_network = gtk_widget_get_toplevel( GTK_WIDGET (togglebutton) );
-    b_channel = gtk_toggle_button_get_active( togglebutton );
-    b_broadcast = gtk_toggle_button_get_active( gtk_object_get_data(
-                  GTK_OBJECT( p_network ), "network_broadcast_check" ) );
-        
     gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_channel_combo" ), b_channel ) ;
-
-    gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_channel" ), b_channel );
-
+                    "network_multicast_address_label" ),
+                    gtk_toggle_button_get_active( togglebutton ) );
     gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_channel_port" ), b_channel );
+                    "network_multicast_address_combo" ),
+                    gtk_toggle_button_get_active( togglebutton ) );
 
     gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_channel_port_label" ), b_channel );
-
+                    "network_multicast_port_label" ),
+                    gtk_toggle_button_get_active( togglebutton ) );
     gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_server_combo" ), ! b_channel );
+                    "network_multicast_port" ),
+                    gtk_toggle_button_get_active( togglebutton ) );
+}
 
-    gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_server_label" ), ! b_channel );
 
-    gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_server" ), ! b_channel );
+void GtkNetworkOpenChannel( GtkToggleButton *togglebutton,
+                                       gpointer user_data )
+{
+    GtkWidget *     p_network;
 
+    p_network = gtk_widget_get_toplevel( GTK_WIDGET (togglebutton) );
     gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_port_label" ), ! b_channel );
-
+                    "network_channel_address_label" ),
+                    gtk_toggle_button_get_active( togglebutton ) );
     gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_port" ), ! b_channel );
+                    "network_channel_address_combo" ),
+                    gtk_toggle_button_get_active( togglebutton ) );
 
     gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_broadcast_check" ), ! b_channel );
-    
+                    "network_channel_port_label" ),
+                    gtk_toggle_button_get_active( togglebutton ) );
     gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_broadcast_combo" ), b_broadcast && ! b_channel );
+                    "network_channel_port" ),
+                    gtk_toggle_button_get_active( togglebutton ) );
+}
 
+
+void GtkNetworkOpenHTTP( GtkToggleButton *togglebutton,
+                                         gpointer user_data )
+{   
+    GtkWidget *     p_network;
+
+    p_network = gtk_widget_get_toplevel( GTK_WIDGET (togglebutton) );
+    gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
+                    "network_http_url_label" ),
+                    gtk_toggle_button_get_active( togglebutton ) );
     gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_network ),
-            "network_broadcast" ), b_broadcast && ! b_channel );
+                    "network_http_url" ),
+                    gtk_toggle_button_get_active( togglebutton ) );
 }
 
+
 /*****************************************************************************
  * Open satellite callbacks
  *****************************************************************************
index 987d9a93e5c1c6a9df9545b376cd02e11ba1bbe8..c4efb66d139de0f9cfb8fa88e7dd8f4740311ba1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
+ * NE PAS ÉDITER CE FICHIER - il est généré par Glade.
  */
 
 #ifdef HAVE_CONFIG_H
index 17b71ecdecaa005c67a0893f7e96fa5c9fef8504..d629e22e553f08313fa5945d7878ec90588b994b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * This file was created automatically by glade and fixed by fixfiles.sh
+ * NE PAS ÉDITER CE FICHIER - il est généré par Glade.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -11,7 +11,7 @@
 /*
  * Standard gettext macros.
  */
-#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT )
+#ifdef ENABLE_NLS
 #  include <libintl.h>
 #  undef _
 #  define _(String) dgettext (PACKAGE, String)