PDA Interface:

* More changes on the Camera tabpage
* Cleanup some dead interface wood ;-)

diff --git a/modules/gui/pda/pda.glade b/modules/gui/pda/pda.glade
index 2d5c3f57c5c2a5c9d93b04816395346897602d77..97e19ba98803da7e4f4359caaf79d60b69dda310 100644 (file)
--- a/modules/gui/pda/pda.glade
+++ b/modules/gui/pda/pda.glade
@@ -342,10 +342,10 @@
                          <property name="editable">True</property>
                          <property name="visibility">True</property>
                          <property name="max_length">0</property>
-                         <property name="text" translatable="yes"></property>
+                         <property name="text" translatable="yes">udp://:1234</property>
                          <property name="has_frame">True</property>
                          <property name="invisible_char" translatable="yes">*</property>
-                         <property name="activates_default">False</property>
+                         <property name="activates_default">True</property>
                        </widget>
                      </child>
 
@@ -573,10 +573,10 @@
                          <property name="editable">True</property>
                          <property name="visibility">True</property>
                          <property name="max_length">0</property>
-                         <property name="text" translatable="yes"></property>
+                         <property name="text" translatable="yes">unicast</property>
                          <property name="has_frame">True</property>
                          <property name="invisible_char" translatable="yes">*</property>
-                         <property name="activates_default">False</property>
+                         <property name="activates_default">True</property>
                          <signal name="changed" handler="NetworkBuildMRL" last_modification_time="Sat, 08 Nov 2003 13:34:45 GMT"/>
                        </widget>
                      </child>
@@ -931,6 +931,7 @@
                                  <property name="has_frame">True</property>
                                  <property name="invisible_char" translatable="yes">*</property>
                                  <property name="activates_default">True</property>
+                                 <signal name="changed" handler="V4LBuildMRL" last_modification_time="Sun, 09 Nov 2003 15:44:46 GMT"/>
                                </widget>
                              </child>
 
@@ -994,6 +995,7 @@
                                  <property name="has_frame">True</property>
                                  <property name="invisible_char" translatable="yes">*</property>
                                  <property name="activates_default">True</property>
+                                 <signal name="changed" handler="V4LBuildMRL" last_modification_time="Sun, 09 Nov 2003 15:45:10 GMT"/>
                                </widget>
                              </child>
 
@@ -1080,6 +1082,7 @@
                              <property name="snap_to_ticks">False</property>
                              <property name="wrap">False</property>
                              <property name="adjustment">0 0 100 1 10 10</property>
+                             <signal name="changed" handler="V4LBuildMRL" last_modification_time="Sun, 09 Nov 2003 15:45:26 GMT"/>
                            </widget>
                            <packing>
                              <property name="left_attach">1</property>
@@ -1134,6 +1137,7 @@
                                  <property name="has_frame">True</property>
                                  <property name="invisible_char" translatable="yes">*</property>
                                  <property name="activates_default">True</property>
+                                 <signal name="changed" handler="V4LBuildMRL" last_modification_time="Sun, 09 Nov 2003 15:45:49 GMT"/>
                                </widget>
                              </child>
 
@@ -1229,6 +1233,7 @@
                                  <property name="has_frame">True</property>
                                  <property name="invisible_char" translatable="yes">*</property>
                                  <property name="activates_default">True</property>
+                                 <signal name="changed" handler="V4LBuildMRL" last_modification_time="Sun, 09 Nov 2003 15:46:04 GMT"/>
                                </widget>
                              </child>
 
@@ -1339,6 +1344,7 @@
                              <property name="snap_to_ticks">False</property>
                              <property name="wrap">False</property>
                              <property name="adjustment">8692 0 65535 1 10 10</property>
+                             <signal name="changed" handler="V4LBuildMRL" last_modification_time="Sun, 09 Nov 2003 15:46:20 GMT"/>
                            </widget>
                            <packing>
                              <property name="left_attach">1</property>
@@ -1384,6 +1390,7 @@
                              <property name="snap_to_ticks">False</property>
                              <property name="wrap">False</property>
                              <property name="adjustment">44100 0 65535 1 10 10</property>
+                             <signal name="changed" handler="V4LBuildMRL" last_modification_time="Sun, 09 Nov 2003 15:46:34 GMT"/>
                            </widget>
                            <packing>
                              <property name="left_attach">1</property>
@@ -1429,6 +1436,7 @@
                              <property name="snap_to_ticks">False</property>
                              <property name="wrap">False</property>
                              <property name="adjustment">100 0 65535 1 10 10</property>
+                             <signal name="changed" handler="V4LBuildMRL" last_modification_time="Sun, 09 Nov 2003 15:46:51 GMT"/>
                            </widget>
                            <packing>
                              <property name="left_attach">1</property>
@@ -1440,9 +1448,9 @@
                          </child>
 
                          <child>
-                           <widget class="GtkLabel" id="labelV4lDecimation">
+                           <widget class="GtkLabel" id="labelV4LTuner">
                              <property name="visible">True</property>
-                             <property name="label" translatable="yes">Decimation:</property>
+                             <property name="label" translatable="yes">Tuner:</property>
                              <property name="use_underline">False</property>
                              <property name="use_markup">False</property>
                              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1456,15 +1464,15 @@
                            <packing>
                              <property name="left_attach">0</property>
                              <property name="right_attach">1</property>
-                             <property name="top_attach">8</property>
-                             <property name="bottom_attach">9</property>
+                             <property name="top_attach">9</property>
+                             <property name="bottom_attach">10</property>
                              <property name="x_options">fill</property>
                              <property name="y_options"></property>
                            </packing>
                          </child>
 
                          <child>
-                           <widget class="GtkSpinButton" id="entryV4LDecimation">
+                           <widget class="GtkSpinButton" id="entryV4LTuner">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
                              <property name="climb_rate">1</property>
@@ -1473,21 +1481,22 @@
                              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                              <property name="snap_to_ticks">False</property>
                              <property name="wrap">False</property>
-                             <property name="adjustment">1 0 65535 1 10 10</property>
+                             <property name="adjustment">0 -1 100 1 10 10</property>
+                             <signal name="changed" handler="V4LBuildMRL" last_modification_time="Sun, 09 Nov 2003 15:47:25 GMT"/>
                            </widget>
                            <packing>
                              <property name="left_attach">1</property>
                              <property name="right_attach">2</property>
-                             <property name="top_attach">8</property>
-                             <property name="bottom_attach">9</property>
+                             <property name="top_attach">9</property>
+                             <property name="bottom_attach">10</property>
                              <property name="y_options"></property>
                            </packing>
                          </child>
 
                          <child>
-                           <widget class="GtkLabel" id="labelV4LTuner">
+                           <widget class="GtkLabel" id="labelV4LSoundDirection">
                              <property name="visible">True</property>
-                             <property name="label" translatable="yes">Tuner:</property>
+                             <property name="label" translatable="yes">Sound:</property>
                              <property name="use_underline">False</property>
                              <property name="use_markup">False</property>
                              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1501,34 +1510,13 @@
                            <packing>
                              <property name="left_attach">0</property>
                              <property name="right_attach">1</property>
-                             <property name="top_attach">9</property>
-                             <property name="bottom_attach">10</property>
+                             <property name="top_attach">8</property>
+                             <property name="bottom_attach">9</property>
                              <property name="x_options">fill</property>
                              <property name="y_options"></property>
                            </packing>
                          </child>
 
-                         <child>
-                           <widget class="GtkSpinButton" id="entryV4LTuner">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="climb_rate">1</property>
-                             <property name="digits">0</property>
-                             <property name="numeric">True</property>
-                             <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                             <property name="snap_to_ticks">False</property>
-                             <property name="wrap">False</property>
-                             <property name="adjustment">0 -1 100 1 10 10</property>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
-                             <property name="top_attach">9</property>
-                             <property name="bottom_attach">10</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
                          <child>
                            <widget class="GtkCombo" id="comboV4LSoundDirection">
                              <property name="visible">True</property>
@@ -1549,6 +1537,7 @@
                                  <property name="has_frame">True</property>
                                  <property name="invisible_char" translatable="yes">*</property>
                                  <property name="activates_default">True</property>
+                                 <signal name="changed" handler="V4LBuildMRL" last_modification_time="Sun, 09 Nov 2003 15:47:10 GMT"/>
                                </widget>
                              </child>
 
@@ -1558,7 +1547,7 @@
                                  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
 
                                  <child>
-                                   <widget class="GtkListItem" id="listitem1483">
+                                   <widget class="GtkListItem" id="itemV4LSoundDirectionMono">
                                      <property name="visible">True</property>
                                      <property name="can_focus">True</property>
                                      <property name="label" translatable="yes">Mono</property>
@@ -1566,7 +1555,7 @@
                                  </child>
 
                                  <child>
-                                   <widget class="GtkListItem" id="listitem1484">
+                                   <widget class="GtkListItem" id="itemV4LSoundDirectionStereo">
                                      <property name="visible">True</property>
                                      <property name="can_focus">True</property>
                                      <property name="label" translatable="yes">Stereo</property>
@@ -1578,16 +1567,16 @@
                            <packing>
                              <property name="left_attach">1</property>
                              <property name="right_attach">2</property>
-                             <property name="top_attach">10</property>
-                             <property name="bottom_attach">11</property>
+                             <property name="top_attach">8</property>
+                             <property name="bottom_attach">9</property>
                              <property name="y_options"></property>
                            </packing>
                          </child>
 
                          <child>
-                           <widget class="GtkLabel" id="labelV4LSound">
+                           <widget class="GtkLabel" id="labelV4LMJPEG">
                              <property name="visible">True</property>
-                             <property name="label" translatable="yes">Sound:</property>
+                             <property name="label" translatable="yes">MJPEG:</property>
                              <property name="use_underline">False</property>
                              <property name="use_markup">False</property>
                              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1607,6 +1596,73 @@
                              <property name="y_options"></property>
                            </packing>
                          </child>
+
+                         <child>
+                           <widget class="GtkCheckButton" id="checkV4LMJPEG">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">enable</property>
+                             <property name="use_underline">True</property>
+                             <property name="relief">GTK_RELIEF_NORMAL</property>
+                             <property name="active">False</property>
+                             <property name="inconsistent">False</property>
+                             <property name="draw_indicator">True</property>
+                           </widget>
+                           <packing>
+                             <property name="left_attach">1</property>
+                             <property name="right_attach">2</property>
+                             <property name="top_attach">10</property>
+                             <property name="bottom_attach">11</property>
+                             <property name="x_options">fill</property>
+                             <property name="y_options"></property>
+                           </packing>
+                         </child>
+
+                         <child>
+                           <widget class="GtkLabel" id="labelV4LDecimation">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">Decimation:</property>
+                             <property name="use_underline">False</property>
+                             <property name="use_markup">False</property>
+                             <property name="justify">GTK_JUSTIFY_LEFT</property>
+                             <property name="wrap">False</property>
+                             <property name="selectable">False</property>
+                             <property name="xalign">0</property>
+                             <property name="yalign">0.5</property>
+                             <property name="xpad">0</property>
+                             <property name="ypad">0</property>
+                           </widget>
+                           <packing>
+                             <property name="left_attach">0</property>
+                             <property name="right_attach">1</property>
+                             <property name="top_attach">11</property>
+                             <property name="bottom_attach">12</property>
+                             <property name="x_options">fill</property>
+                             <property name="y_options"></property>
+                           </packing>
+                         </child>
+
+                         <child>
+                           <widget class="GtkSpinButton" id="entryV4LDecimation">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="climb_rate">1</property>
+                             <property name="digits">0</property>
+                             <property name="numeric">False</property>
+                             <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                             <property name="snap_to_ticks">False</property>
+                             <property name="wrap">False</property>
+                             <property name="adjustment">1 0 100 1 10 10</property>
+                             <signal name="changed" handler="V4LBuildMRL" last_modification_time="Sun, 09 Nov 2003 15:48:07 GMT"/>
+                           </widget>
+                           <packing>
+                             <property name="left_attach">1</property>
+                             <property name="right_attach">2</property>
+                             <property name="top_attach">11</property>
+                             <property name="bottom_attach">12</property>
+                             <property name="y_options"></property>
+                           </packing>
+                         </child>
                        </widget>
                      </child>
                    </widget>
@@ -1688,499 +1744,30 @@
              <property name="spacing">0</property>
 
              <child>
-               <widget class="GtkVBox" id="vbox6">
+               <widget class="GtkScrolledWindow" id="scrolledwindowTranscode">
                  <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">0</property>
+                 <property name="can_focus">True</property>
+                 <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                 <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+                 <property name="shadow_type">GTK_SHADOW_NONE</property>
+                 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
                  <child>
-                   <widget class="GtkFrame" id="frameVideo">
+                   <widget class="GtkViewport" id="viewport5">
                      <property name="visible">True</property>
-                     <property name="label_xalign">0</property>
-                     <property name="label_yalign">0.5</property>
-                     <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                     <property name="shadow_type">GTK_SHADOW_IN</property>
 
                      <child>
-                       <widget class="GtkTable" id="table4">
+                       <widget class="GtkTable" id="table6">
                          <property name="visible">True</property>
-                         <property name="n_rows">3</property>
+                         <property name="n_rows">14</property>
                          <property name="n_columns">2</property>
                          <property name="homogeneous">False</property>
                          <property name="row_spacing">0</property>
                          <property name="column_spacing">0</property>
-
-                         <child>
-                           <widget class="GtkLabel" id="labelVideoDevice">
-                             <property name="visible">True</property>
-                             <property name="label" translatable="yes">Device :</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">0</property>
-                             <property name="right_attach">1</property>
-                             <property name="top_attach">0</property>
-                             <property name="bottom_attach">1</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkLabel" id="labelVideoCodec">
-                             <property name="visible">True</property>
-                             <property name="label" translatable="yes">Codec :</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">0</property>
-                             <property name="right_attach">1</property>
-                             <property name="top_attach">1</property>
-                             <property name="bottom_attach">2</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkLabel" id="labelVideoBitrate">
-                             <property name="visible">True</property>
-                             <property name="label" translatable="yes">Bitrate :</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">0</property>
-                             <property name="right_attach">1</property>
-                             <property name="top_attach">2</property>
-                             <property name="bottom_attach">3</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkCombo" id="comboVideoDevice">
-                             <property name="visible">True</property>
-                             <property name="value_in_list">False</property>
-                             <property name="allow_empty">True</property>
-                             <property name="case_sensitive">False</property>
-                             <property name="enable_arrow_keys">True</property>
-                             <property name="enable_arrows_always">False</property>
-
-                             <child internal-child="entry">
-                               <widget class="GtkEntry" id="entryVideoDevice">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="editable">True</property>
-                                 <property name="visibility">True</property>
-                                 <property name="max_length">0</property>
-                                 <property name="text" translatable="yes">/dev/video</property>
-                                 <property name="has_frame">True</property>
-                                 <property name="invisible_char" translatable="yes">*</property>
-                                 <property name="activates_default">False</property>
-                                 <signal name="changed" handler="onVideoDeviceChanged" last_modification_time="Fri, 26 Sep 2003 12:43:13 GMT"/>
-                                 <signal name="editing_done" handler="onEntryVideoDeviceEditingDone" last_modification_time="Fri, 26 Sep 2003 13:34:44 GMT"/>
-                               </widget>
-                             </child>
-
-                             <child internal-child="list">
-                               <widget class="GtkList" id="listVideoDevice">
-                                 <property name="visible">True</property>
-                                 <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-                               </widget>
-                             </child>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
-                             <property name="top_attach">0</property>
-                             <property name="bottom_attach">1</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkCombo" id="comboVideoCodec">
-                             <property name="visible">True</property>
-                             <property name="value_in_list">False</property>
-                             <property name="allow_empty">True</property>
-                             <property name="case_sensitive">False</property>
-                             <property name="enable_arrow_keys">True</property>
-                             <property name="enable_arrows_always">False</property>
-
-                             <child internal-child="entry">
-                               <widget class="GtkEntry" id="entryVideoCodec">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="editable">True</property>
-                                 <property name="visibility">True</property>
-                                 <property name="max_length">0</property>
-                                 <property name="text" translatable="yes">raw</property>
-                                 <property name="has_frame">True</property>
-                                 <property name="invisible_char" translatable="yes">*</property>
-                                 <property name="activates_default">False</property>
-                                 <signal name="changed" handler="onVideoCodecChanged" last_modification_time="Fri, 26 Sep 2003 12:43:54 GMT"/>
-                                 <signal name="editing_done" handler="onEntryVideoCodecEditingDone" last_modification_time="Fri, 26 Sep 2003 13:34:58 GMT"/>
-                               </widget>
-                             </child>
-
-                             <child internal-child="list">
-                               <widget class="GtkList" id="listVideoCodec">
-                                 <property name="visible">True</property>
-                                 <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                                 <child>
-                                   <widget class="GtkListItem" id="listitem1141">
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="label" translatable="yes">raw</property>
-                                   </widget>
-                                 </child>
-
-                                 <child>
-                                   <widget class="GtkListItem" id="listitem1142">
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="label" translatable="yes">huff</property>
-                                   </widget>
-                                 </child>
-
-                                 <child>
-                                   <widget class="GtkListItem" id="listitem1143">
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="label" translatable="yes"></property>
-                                   </widget>
-                                 </child>
-                               </widget>
-                             </child>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
-                             <property name="top_attach">1</property>
-                             <property name="bottom_attach">2</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkSpinButton" id="spinVideoBitrate">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="climb_rate">1</property>
-                             <property name="digits">0</property>
-                             <property name="numeric">False</property>
-                             <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                             <property name="snap_to_ticks">False</property>
-                             <property name="wrap">False</property>
-                             <property name="adjustment">64 0 100 1 10 10</property>
-                             <signal name="changed" handler="onVideoBitrateChanged" last_modification_time="Fri, 26 Sep 2003 12:44:26 GMT"/>
-                             <signal name="editing_done" handler="onVideoBitrateEditingDone" last_modification_time="Fri, 26 Sep 2003 13:35:16 GMT"/>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
-                             <property name="top_attach">2</property>
-                             <property name="bottom_attach">3</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label42">
-                         <property name="visible">True</property>
-                         <property name="label" translatable="yes">Video</property>
-                         <property name="use_underline">False</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                       <packing>
-                         <property name="type">label_item</property>
-                       </packing>
-                     </child>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkFrame" id="frameAudio">
-                     <property name="visible">True</property>
-                     <property name="label_xalign">0</property>
-                     <property name="label_yalign">0.5</property>
-                     <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-                     <child>
-                       <widget class="GtkTable" id="table3">
-                         <property name="visible">True</property>
-                         <property name="n_rows">3</property>
-                         <property name="n_columns">2</property>
-                         <property name="homogeneous">False</property>
-                         <property name="row_spacing">0</property>
-                         <property name="column_spacing">0</property>
-
-                         <child>
-                           <widget class="GtkLabel" id="labelAudioDevice">
-                             <property name="visible">True</property>
-                             <property name="label" translatable="yes">Device :</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">0</property>
-                             <property name="right_attach">1</property>
-                             <property name="top_attach">0</property>
-                             <property name="bottom_attach">1</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkLabel" id="labelAudioCodec">
-                             <property name="visible">True</property>
-                             <property name="label" translatable="yes">Codec :</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">0</property>
-                             <property name="right_attach">1</property>
-                             <property name="top_attach">1</property>
-                             <property name="bottom_attach">2</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkLabel" id="labelAudioBitrate">
-                             <property name="visible">True</property>
-                             <property name="label" translatable="yes">Bitrate :</property>
-                             <property name="use_underline">False</property>
-                             <property name="use_markup">False</property>
-                             <property name="justify">GTK_JUSTIFY_LEFT</property>
-                             <property name="wrap">False</property>
-                             <property name="selectable">False</property>
-                             <property name="xalign">0</property>
-                             <property name="yalign">0.5</property>
-                             <property name="xpad">0</property>
-                             <property name="ypad">0</property>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">0</property>
-                             <property name="right_attach">1</property>
-                             <property name="top_attach">2</property>
-                             <property name="bottom_attach">3</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkCombo" id="comboAudioDevice">
-                             <property name="visible">True</property>
-                             <property name="value_in_list">False</property>
-                             <property name="allow_empty">True</property>
-                             <property name="case_sensitive">False</property>
-                             <property name="enable_arrow_keys">True</property>
-                             <property name="enable_arrows_always">False</property>
-
-                             <child internal-child="entry">
-                               <widget class="GtkEntry" id="entryAudioDevice">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="editable">True</property>
-                                 <property name="visibility">True</property>
-                                 <property name="max_length">0</property>
-                                 <property name="text" translatable="yes">/dev/dsp</property>
-                                 <property name="has_frame">True</property>
-                                 <property name="invisible_char" translatable="yes">*</property>
-                                 <property name="activates_default">False</property>
-                                 <signal name="changed" handler="onAudioDeviceChanged" last_modification_time="Fri, 26 Sep 2003 12:45:20 GMT"/>
-                                 <signal name="editing_done" handler="onEntryAudioDeviceEditingDone" last_modification_time="Fri, 26 Sep 2003 13:35:30 GMT"/>
-                               </widget>
-                             </child>
-
-                             <child internal-child="list">
-                               <widget class="GtkList" id="listAudioDevice">
-                                 <property name="visible">True</property>
-                                 <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-                               </widget>
-                             </child>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
-                             <property name="top_attach">0</property>
-                             <property name="bottom_attach">1</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkCombo" id="comboAudioCodec">
-                             <property name="visible">True</property>
-                             <property name="value_in_list">False</property>
-                             <property name="allow_empty">True</property>
-                             <property name="case_sensitive">False</property>
-                             <property name="enable_arrow_keys">True</property>
-                             <property name="enable_arrows_always">False</property>
-
-                             <child internal-child="entry">
-                               <widget class="GtkEntry" id="entryAudioCodec">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="editable">True</property>
-                                 <property name="visibility">True</property>
-                                 <property name="max_length">0</property>
-                                 <property name="text" translatable="yes">raw</property>
-                                 <property name="has_frame">True</property>
-                                 <property name="invisible_char" translatable="yes">*</property>
-                                 <property name="activates_default">False</property>
-                                 <signal name="changed" handler="onAudioCodecChanged" last_modification_time="Fri, 26 Sep 2003 12:45:50 GMT"/>
-                                 <signal name="editing_done" handler="onEntryAudioCodecEditingDone" last_modification_time="Fri, 26 Sep 2003 13:35:43 GMT"/>
-                               </widget>
-                             </child>
-
-                             <child internal-child="list">
-                               <widget class="GtkList" id="listAudioCodec">
-                                 <property name="visible">True</property>
-                                 <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-                                 <child>
-                                   <widget class="GtkListItem" id="listitem1129">
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="label" translatable="yes">raw</property>
-                                   </widget>
-                                 </child>
-
-                                 <child>
-                                   <widget class="GtkListItem" id="listitem1130">
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="label" translatable="yes">alaw</property>
-                                   </widget>
-                                 </child>
-
-                                 <child>
-                                   <widget class="GtkListItem" id="listitem1131">
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="label" translatable="yes">ulaw</property>
-                                   </widget>
-                                 </child>
-                               </widget>
-                             </child>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
-                             <property name="top_attach">1</property>
-                             <property name="bottom_attach">2</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkSpinButton" id="spinAudioBitrate">
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="climb_rate">1</property>
-                             <property name="digits">0</property>
-                             <property name="numeric">True</property>
-                             <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                             <property name="snap_to_ticks">False</property>
-                             <property name="wrap">False</property>
-                             <property name="adjustment">64 0 100 1 10 10</property>
-                             <signal name="changed" handler="onAudioBitrateChanged" last_modification_time="Fri, 26 Sep 2003 12:46:22 GMT"/>
-                             <signal name="editing_done" handler="onAudioBitrateEditingDone" last_modification_time="Fri, 26 Sep 2003 13:35:57 GMT"/>
-                           </widget>
-                           <packing>
-                             <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
-                             <property name="top_attach">2</property>
-                             <property name="bottom_attach">3</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label41">
-                         <property name="visible">True</property>
-                         <property name="label" translatable="yes">Audio</property>
-                         <property name="use_underline">False</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
                        </widget>
-                       <packing>
-                         <property name="type">label_item</property>
-                       </packing>
                      </child>
                    </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
                  </child>
                </widget>
                <packing>
@@ -2201,13 +1788,13 @@
                  </child>
 
                  <child>
-                   <widget class="GtkButton" id="AddServerToPlaylist">
+                   <widget class="GtkButton" id="AddTranscodeToPlaylist">
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
                      <property name="label" translatable="yes">Add to Playlist</property>
                      <property name="use_underline">True</property>
                      <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <signal name="pressed" handler="onAddServerToPlaylist" last_modification_time="Fri, 26 Sep 2003 12:46:58 GMT"/>
+                     <signal name="pressed" handler="onAddTranscodeToPlaylist" last_modification_time="Sun, 09 Nov 2003 15:55:09 GMT"/>
                    </widget>
                    <packing>
                      <property name="padding">0</property>

diff --git a/modules/gui/pda/pda_callbacks.c b/modules/gui/pda/pda_callbacks.c
index 136e06fd88df116448835d8a5ede372f705ac9d5..788bc0f3011d2437056bd9ee13a2e949ca7e5238 100644 (file)
--- a/modules/gui/pda/pda_callbacks.c
+++ b/modules/gui/pda/pda_callbacks.c
@@ -2,7 +2,7 @@
  * pda_callbacks.c : Callbacks for the pda Linux Gtk+ plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: pda_callbacks.c,v 1.9 2003/11/09 13:59:21 jpsaman Exp $
+ * $Id: pda_callbacks.c,v 1.10 2003/11/09 15:55:23 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -569,21 +569,6 @@ onAddFileToPlaylist                    (GtkButton       *button,
 }
 
 
-void
-onEntryMRLChanged                      (GtkEditable     *editable,
-                                        gpointer         user_data)
-{
-}
-
-
-void
-onEntryMRLEditingDone                  (GtkCellEditable *celleditable,
-                                        gpointer         user_data)
-{
-    g_print("onMRLEditingDone\n");
-}
-
-
 void
 NetworkBuildMRL                        (GtkEditable     *editable,
                                         gpointer         user_data)
@@ -659,38 +644,6 @@ onAddNetworkPlaylist                   (GtkButton       *button,
 }
 
 
-void
-onV4LAudioChanged                      (GtkEditable     *editable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onEntryV4LAudioEditingDone             (GtkCellEditable *celleditable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onV4LVideoChanged                      (GtkEditable     *editable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onEntryV4LVideoEditingDone             (GtkCellEditable *celleditable,
-                                        gpointer         user_data)
-{
-
-}
-
-
 void
 onAddCameraToPlaylist                  (GtkButton       *button,
                                         gpointer         user_data)
@@ -699,110 +652,6 @@ onAddCameraToPlaylist                  (GtkButton       *button,
 }
 
 
-void
-onVideoDeviceChanged                   (GtkEditable     *editable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onEntryVideoDeviceEditingDone          (GtkCellEditable *celleditable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onVideoCodecChanged                    (GtkEditable     *editable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onEntryVideoCodecEditingDone           (GtkCellEditable *celleditable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onVideoBitrateChanged                  (GtkEditable     *editable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onVideoBitrateEditingDone              (GtkCellEditable *celleditable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onAudioDeviceChanged                   (GtkEditable     *editable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onEntryAudioDeviceEditingDone          (GtkCellEditable *celleditable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onAudioCodecChanged                    (GtkEditable     *editable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onEntryAudioCodecEditingDone           (GtkCellEditable *celleditable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onAudioBitrateChanged                  (GtkEditable     *editable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onAudioBitrateEditingDone              (GtkCellEditable *celleditable,
-                                        gpointer         user_data)
-{
-
-}
-
-
-void
-onAddServerToPlaylist                  (GtkButton       *button,
-                                        gpointer         user_data)
-{
-
-}
-
-
 gboolean
 PlaylistEvent                          (GtkWidget       *widget,
                                         GdkEvent        *event,
@@ -899,3 +748,21 @@ onNetworkMRLAdd                        (GtkContainer    *container,
 }
 
 
+
+void
+V4LBuildMRL                            (GtkEditable     *editable,
+                                        gpointer         user_data)
+{
+//    GtkSpinButton *networkPort = NULL;
+//    GtkEntry      *entryMRL = NULL;
+
+}
+
+
+void
+onAddTranscodeToPlaylist               (GtkButton       *button,
+                                        gpointer         user_data)
+{
+
+}
+

diff --git a/modules/gui/pda/pda_callbacks.h b/modules/gui/pda/pda_callbacks.h
index 349813f037d83cc3dcfddc38a76b2c0495aaf5ee..ad272fef4c109087eb9fbdd84430fb3bfb77b499 100644 (file)
--- a/modules/gui/pda/pda_callbacks.h
+++ b/modules/gui/pda/pda_callbacks.h
@@ -2,7 +2,7 @@
  * callbacks.h : pda plugin for vlc
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: pda_callbacks.h,v 1.5 2003/11/08 16:04:05 jpsaman Exp $
+ * $Id: pda_callbacks.h,v 1.6 2003/11/09 15:55:23 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -89,90 +89,14 @@ void
 onAddFileToPlaylist                    (GtkButton       *button,
                                         gpointer         user_data);
 
-void
-onEntryMRLChanged                      (GtkEditable     *editable,
-                                        gpointer         user_data);
-
-void
-onEntryMRLEditingDone                  (GtkCellEditable *celleditable,
-                                        gpointer         user_data);
-
 void
 onAddNetworkPlaylist                   (GtkButton       *button,
                                         gpointer         user_data);
 
-void
-onV4LAudioChanged                      (GtkEditable     *editable,
-                                        gpointer         user_data);
-
-void
-onEntryV4LAudioEditingDone             (GtkCellEditable *celleditable,
-                                        gpointer         user_data);
-
-void
-onV4LVideoChanged                      (GtkEditable     *editable,
-                                        gpointer         user_data);
-
-void
-onEntryV4LVideoEditingDone             (GtkCellEditable *celleditable,
-                                        gpointer         user_data);
-
 void
 onAddCameraToPlaylist                  (GtkButton       *button,
                                         gpointer         user_data);
 
-void
-onVideoDeviceChanged                   (GtkEditable     *editable,
-                                        gpointer         user_data);
-
-void
-onEntryVideoDeviceEditingDone          (GtkCellEditable *celleditable,
-                                        gpointer         user_data);
-
-void
-onVideoCodecChanged                    (GtkEditable     *editable,
-                                        gpointer         user_data);
-
-void
-onEntryVideoCodecEditingDone           (GtkCellEditable *celleditable,
-                                        gpointer         user_data);
-
-void
-onVideoBitrateChanged                  (GtkEditable     *editable,
-                                        gpointer         user_data);
-
-void
-onVideoBitrateEditingDone              (GtkCellEditable *celleditable,
-                                        gpointer         user_data);
-
-void
-onAudioDeviceChanged                   (GtkEditable     *editable,
-                                        gpointer         user_data);
-
-void
-onEntryAudioDeviceEditingDone          (GtkCellEditable *celleditable,
-                                        gpointer         user_data);
-
-void
-onAudioCodecChanged                    (GtkEditable     *editable,
-                                        gpointer         user_data);
-
-void
-onEntryAudioCodecEditingDone           (GtkCellEditable *celleditable,
-                                        gpointer         user_data);
-
-void
-onAudioBitrateChanged                  (GtkEditable     *editable,
-                                        gpointer         user_data);
-
-void
-onAudioBitrateEditingDone              (GtkCellEditable *celleditable,
-                                        gpointer         user_data);
-
-void
-onAddServerToPlaylist                  (GtkButton       *button,
-                                        gpointer         user_data);
-
 gboolean
 PlaylistEvent                          (GtkWidget       *widget,
                                         GdkEvent        *event,
@@ -226,3 +150,11 @@ onNetworkMRLAdd                        (GtkContainer    *container,
 void
 NetworkBuildMRL                        (GtkEditable     *editable,
                                         gpointer         user_data);
+
+void
+V4LBuildMRL                            (GtkEditable     *editable,
+                                        gpointer         user_data);
+
+void
+onAddTranscodeToPlaylist               (GtkButton       *button,
+                                        gpointer         user_data);

diff --git a/modules/gui/pda/pda_interface.c b/modules/gui/pda/pda_interface.c
index 3f4654b6f0d357ad53e2765c58aa8a46c198e397..ad2c395246091b955e643d5046e0c55d83481444 100644 (file)
--- a/modules/gui/pda/pda_interface.c
+++ b/modules/gui/pda/pda_interface.c
@@ -108,49 +108,27 @@ create_pda (void)
   GtkWidget *labelV4LQuality;
   GtkObject *entryV4LQuality_adj;
   GtkWidget *entryV4LQuality;
-  GtkWidget *labelV4lDecimation;
-  GtkObject *entryV4LDecimation_adj;
-  GtkWidget *entryV4LDecimation;
   GtkWidget *labelV4LTuner;
   GtkObject *entryV4LTuner_adj;
   GtkWidget *entryV4LTuner;
+  GtkWidget *labelV4LSoundDirection;
   GtkWidget *comboV4LSoundDirection;
   GList *comboV4LSoundDirection_items = NULL;
   GtkWidget *entryV4LSoundDirection;
-  GtkWidget *labelV4LSound;
+  GtkWidget *labelV4LMJPEG;
+  GtkWidget *checkV4LMJPEG;
+  GtkWidget *labelV4LDecimation;
+  GtkObject *entryV4LDecimation_adj;
+  GtkWidget *entryV4LDecimation;
   GtkWidget *hbox16;
   GtkWidget *AddCameraToPlaylist;
   GtkWidget *Camera;
   GtkWidget *vbox1;
-  GtkWidget *vbox6;
-  GtkWidget *frameVideo;
-  GtkWidget *table4;
-  GtkWidget *labelVideoDevice;
-  GtkWidget *labelVideoCodec;
-  GtkWidget *labelVideoBitrate;
-  GtkWidget *comboVideoDevice;
-  GtkWidget *entryVideoDevice;
-  GtkWidget *comboVideoCodec;
-  GList *comboVideoCodec_items = NULL;
-  GtkWidget *entryVideoCodec;
-  GtkObject *spinVideoBitrate_adj;
-  GtkWidget *spinVideoBitrate;
-  GtkWidget *label42;
-  GtkWidget *frameAudio;
-  GtkWidget *table3;
-  GtkWidget *labelAudioDevice;
-  GtkWidget *labelAudioCodec;
-  GtkWidget *labelAudioBitrate;
-  GtkWidget *comboAudioDevice;
-  GtkWidget *entryAudioDevice;
-  GtkWidget *comboAudioCodec;
-  GList *comboAudioCodec_items = NULL;
-  GtkWidget *entryAudioCodec;
-  GtkObject *spinAudioBitrate_adj;
-  GtkWidget *spinAudioBitrate;
-  GtkWidget *label41;
+  GtkWidget *scrolledwindowTranscode;
+  GtkWidget *viewport5;
+  GtkWidget *table6;
   GtkWidget *hbox14;
-  GtkWidget *AddServerToPlaylist;
+  GtkWidget *AddTranscodeToPlaylist;
   GtkWidget *Transcode;
   GtkWidget *vbox4;
   GtkWidget *scrolledwindow5;
@@ -376,6 +354,8 @@ create_pda (void)
   gtk_widget_set_name (entryMRL, "entryMRL");
   gtk_widget_show (entryMRL);
   gtk_widget_set_size_request (entryMRL, 158, 24);
+  gtk_entry_set_text (GTK_ENTRY (entryMRL), _("udp://:1234"));
+  gtk_entry_set_activates_default (GTK_ENTRY (entryMRL), TRUE);
 
   hseparator15 = gtk_hseparator_new ();
   gtk_widget_set_name (hseparator15, "hseparator15");
@@ -444,6 +424,8 @@ create_pda (void)
   entryNetworkType = GTK_COMBO (comboNetworkType)->entry;
   gtk_widget_set_name (entryNetworkType, "entryNetworkType");
   gtk_widget_show (entryNetworkType);
+  gtk_entry_set_text (GTK_ENTRY (entryNetworkType), _("unicast"));
+  gtk_entry_set_activates_default (GTK_ENTRY (entryNetworkType), TRUE);
 
   labelNetworkType = gtk_label_new (_("Network: "));
   gtk_widget_set_name (labelNetworkType, "labelNetworkType");
@@ -718,24 +700,6 @@ create_pda (void)
                     (GtkAttachOptions) (0), 0, 0);
   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (entryV4LQuality), TRUE);
 
-  labelV4lDecimation = gtk_label_new (_("Decimation:"));
-  gtk_widget_set_name (labelV4lDecimation, "labelV4lDecimation");
-  gtk_widget_show (labelV4lDecimation);
-  gtk_table_attach (GTK_TABLE (tableV4L), labelV4lDecimation, 0, 1, 8, 9,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (labelV4lDecimation), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (labelV4lDecimation), 0, 0.5);
-
-  entryV4LDecimation_adj = gtk_adjustment_new (1, 0, 65535, 1, 10, 10);
-  entryV4LDecimation = gtk_spin_button_new (GTK_ADJUSTMENT (entryV4LDecimation_adj), 1, 0);
-  gtk_widget_set_name (entryV4LDecimation, "entryV4LDecimation");
-  gtk_widget_show (entryV4LDecimation);
-  gtk_table_attach (GTK_TABLE (tableV4L), entryV4LDecimation, 1, 2, 8, 9,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (entryV4LDecimation), TRUE);
-
   labelV4LTuner = gtk_label_new (_("Tuner:"));
   gtk_widget_set_name (labelV4LTuner, "labelV4LTuner");
   gtk_widget_show (labelV4LTuner);
@@ -754,12 +718,21 @@ create_pda (void)
                     (GtkAttachOptions) (0), 0, 0);
   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (entryV4LTuner), TRUE);
 
+  labelV4LSoundDirection = gtk_label_new (_("Sound:"));
+  gtk_widget_set_name (labelV4LSoundDirection, "labelV4LSoundDirection");
+  gtk_widget_show (labelV4LSoundDirection);
+  gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSoundDirection, 0, 1, 8, 9,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LSoundDirection), GTK_JUSTIFY_LEFT);
+  gtk_misc_set_alignment (GTK_MISC (labelV4LSoundDirection), 0, 0.5);
+
   comboV4LSoundDirection = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (comboV4LSoundDirection)->popwin),
                      "GladeParentKey", comboV4LSoundDirection);
   gtk_widget_set_name (comboV4LSoundDirection, "comboV4LSoundDirection");
   gtk_widget_show (comboV4LSoundDirection);
-  gtk_table_attach (GTK_TABLE (tableV4L), comboV4LSoundDirection, 1, 2, 10, 11,
+  gtk_table_attach (GTK_TABLE (tableV4L), comboV4LSoundDirection, 1, 2, 8, 9,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
   gtk_combo_set_value_in_list (GTK_COMBO (comboV4LSoundDirection), TRUE, TRUE);
@@ -775,14 +748,38 @@ create_pda (void)
   gtk_entry_set_text (GTK_ENTRY (entryV4LSoundDirection), _("Mono"));
   gtk_entry_set_activates_default (GTK_ENTRY (entryV4LSoundDirection), TRUE);
 
-  labelV4LSound = gtk_label_new (_("Sound:"));
-  gtk_widget_set_name (labelV4LSound, "labelV4LSound");
-  gtk_widget_show (labelV4LSound);
-  gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSound, 0, 1, 10, 11,
+  labelV4LMJPEG = gtk_label_new (_("MJPEG:"));
+  gtk_widget_set_name (labelV4LMJPEG, "labelV4LMJPEG");
+  gtk_widget_show (labelV4LMJPEG);
+  gtk_table_attach (GTK_TABLE (tableV4L), labelV4LMJPEG, 0, 1, 10, 11,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (labelV4LSound), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (labelV4LSound), 0, 0.5);
+  gtk_label_set_justify (GTK_LABEL (labelV4LMJPEG), GTK_JUSTIFY_LEFT);
+  gtk_misc_set_alignment (GTK_MISC (labelV4LMJPEG), 0, 0.5);
+
+  checkV4LMJPEG = gtk_check_button_new_with_mnemonic (_("enable"));
+  gtk_widget_set_name (checkV4LMJPEG, "checkV4LMJPEG");
+  gtk_widget_show (checkV4LMJPEG);
+  gtk_table_attach (GTK_TABLE (tableV4L), checkV4LMJPEG, 1, 2, 10, 11,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+
+  labelV4LDecimation = gtk_label_new (_("Decimation:"));
+  gtk_widget_set_name (labelV4LDecimation, "labelV4LDecimation");
+  gtk_widget_show (labelV4LDecimation);
+  gtk_table_attach (GTK_TABLE (tableV4L), labelV4LDecimation, 0, 1, 11, 12,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_label_set_justify (GTK_LABEL (labelV4LDecimation), GTK_JUSTIFY_LEFT);
+  gtk_misc_set_alignment (GTK_MISC (labelV4LDecimation), 0, 0.5);
+
+  entryV4LDecimation_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
+  entryV4LDecimation = gtk_spin_button_new (GTK_ADJUSTMENT (entryV4LDecimation_adj), 1, 0);
+  gtk_widget_set_name (entryV4LDecimation, "entryV4LDecimation");
+  gtk_widget_show (entryV4LDecimation);
+  gtk_table_attach (GTK_TABLE (tableV4L), entryV4LDecimation, 1, 2, 11, 12,
+                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
 
   hbox16 = gtk_hbox_new (FALSE, 0);
   gtk_widget_set_name (hbox16, "hbox16");
@@ -805,189 +802,31 @@ create_pda (void)
   gtk_widget_show (vbox1);
   gtk_container_add (GTK_CONTAINER (notebook), vbox1);
 
-  vbox6 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_set_name (vbox6, "vbox6");
-  gtk_widget_show (vbox6);
-  gtk_box_pack_start (GTK_BOX (vbox1), vbox6, TRUE, TRUE, 0);
-
-  frameVideo = gtk_frame_new (NULL);
-  gtk_widget_set_name (frameVideo, "frameVideo");
-  gtk_widget_show (frameVideo);
-  gtk_box_pack_start (GTK_BOX (vbox6), frameVideo, TRUE, TRUE, 0);
-
-  table4 = gtk_table_new (3, 2, FALSE);
-  gtk_widget_set_name (table4, "table4");
-  gtk_widget_show (table4);
-  gtk_container_add (GTK_CONTAINER (frameVideo), table4);
-
-  labelVideoDevice = gtk_label_new (_("Device :"));
-  gtk_widget_set_name (labelVideoDevice, "labelVideoDevice");
-  gtk_widget_show (labelVideoDevice);
-  gtk_table_attach (GTK_TABLE (table4), labelVideoDevice, 0, 1, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (labelVideoDevice), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (labelVideoDevice), 0, 0.5);
+  scrolledwindowTranscode = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_name (scrolledwindowTranscode, "scrolledwindowTranscode");
+  gtk_widget_show (scrolledwindowTranscode);
+  gtk_box_pack_start (GTK_BOX (vbox1), scrolledwindowTranscode, TRUE, TRUE, 0);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindowTranscode), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
 
-  labelVideoCodec = gtk_label_new (_("Codec :"));
-  gtk_widget_set_name (labelVideoCodec, "labelVideoCodec");
-  gtk_widget_show (labelVideoCodec);
-  gtk_table_attach (GTK_TABLE (table4), labelVideoCodec, 0, 1, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (labelVideoCodec), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (labelVideoCodec), 0, 0.5);
+  viewport5 = gtk_viewport_new (NULL, NULL);
+  gtk_widget_set_name (viewport5, "viewport5");
+  gtk_widget_show (viewport5);
+  gtk_container_add (GTK_CONTAINER (scrolledwindowTranscode), viewport5);
 
-  labelVideoBitrate = gtk_label_new (_("Bitrate :"));
-  gtk_widget_set_name (labelVideoBitrate, "labelVideoBitrate");
-  gtk_widget_show (labelVideoBitrate);
-  gtk_table_attach (GTK_TABLE (table4), labelVideoBitrate, 0, 1, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (labelVideoBitrate), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (labelVideoBitrate), 0, 0.5);
-
-  comboVideoDevice = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (comboVideoDevice)->popwin),
-                     "GladeParentKey", comboVideoDevice);
-  gtk_widget_set_name (comboVideoDevice, "comboVideoDevice");
-  gtk_widget_show (comboVideoDevice);
-  gtk_table_attach (GTK_TABLE (table4), comboVideoDevice, 1, 2, 0, 1,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  entryVideoDevice = GTK_COMBO (comboVideoDevice)->entry;
-  gtk_widget_set_name (entryVideoDevice, "entryVideoDevice");
-  gtk_widget_show (entryVideoDevice);
-  gtk_entry_set_text (GTK_ENTRY (entryVideoDevice), _("/dev/video"));
-
-  comboVideoCodec = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (comboVideoCodec)->popwin),
-                     "GladeParentKey", comboVideoCodec);
-  gtk_widget_set_name (comboVideoCodec, "comboVideoCodec");
-  gtk_widget_show (comboVideoCodec);
-  gtk_table_attach (GTK_TABLE (table4), comboVideoCodec, 1, 2, 1, 2,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("raw"));
-  comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) _("huff"));
-  comboVideoCodec_items = g_list_append (comboVideoCodec_items, (gpointer) "");
-  gtk_combo_set_popdown_strings (GTK_COMBO (comboVideoCodec), comboVideoCodec_items);
-  g_list_free (comboVideoCodec_items);
-
-  entryVideoCodec = GTK_COMBO (comboVideoCodec)->entry;
-  gtk_widget_set_name (entryVideoCodec, "entryVideoCodec");
-  gtk_widget_show (entryVideoCodec);
-  gtk_entry_set_text (GTK_ENTRY (entryVideoCodec), _("raw"));
-
-  spinVideoBitrate_adj = gtk_adjustment_new (64, 0, 100, 1, 10, 10);
-  spinVideoBitrate = gtk_spin_button_new (GTK_ADJUSTMENT (spinVideoBitrate_adj), 1, 0);
-  gtk_widget_set_name (spinVideoBitrate, "spinVideoBitrate");
-  gtk_widget_show (spinVideoBitrate);
-  gtk_table_attach (GTK_TABLE (table4), spinVideoBitrate, 1, 2, 2, 3,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  label42 = gtk_label_new (_("Video"));
-  gtk_widget_set_name (label42, "label42");
-  gtk_widget_show (label42);
-  gtk_frame_set_label_widget (GTK_FRAME (frameVideo), label42);
-  gtk_label_set_justify (GTK_LABEL (label42), GTK_JUSTIFY_LEFT);
-
-  frameAudio = gtk_frame_new (NULL);
-  gtk_widget_set_name (frameAudio, "frameAudio");
-  gtk_widget_show (frameAudio);
-  gtk_box_pack_start (GTK_BOX (vbox6), frameAudio, TRUE, TRUE, 0);
-
-  table3 = gtk_table_new (3, 2, FALSE);
-  gtk_widget_set_name (table3, "table3");
-  gtk_widget_show (table3);
-  gtk_container_add (GTK_CONTAINER (frameAudio), table3);
-
-  labelAudioDevice = gtk_label_new (_("Device :"));
-  gtk_widget_set_name (labelAudioDevice, "labelAudioDevice");
-  gtk_widget_show (labelAudioDevice);
-  gtk_table_attach (GTK_TABLE (table3), labelAudioDevice, 0, 1, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (labelAudioDevice), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (labelAudioDevice), 0, 0.5);
-
-  labelAudioCodec = gtk_label_new (_("Codec :"));
-  gtk_widget_set_name (labelAudioCodec, "labelAudioCodec");
-  gtk_widget_show (labelAudioCodec);
-  gtk_table_attach (GTK_TABLE (table3), labelAudioCodec, 0, 1, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (labelAudioCodec), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (labelAudioCodec), 0, 0.5);
-
-  labelAudioBitrate = gtk_label_new (_("Bitrate :"));
-  gtk_widget_set_name (labelAudioBitrate, "labelAudioBitrate");
-  gtk_widget_show (labelAudioBitrate);
-  gtk_table_attach (GTK_TABLE (table3), labelAudioBitrate, 0, 1, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (labelAudioBitrate), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (labelAudioBitrate), 0, 0.5);
-
-  comboAudioDevice = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (comboAudioDevice)->popwin),
-                     "GladeParentKey", comboAudioDevice);
-  gtk_widget_set_name (comboAudioDevice, "comboAudioDevice");
-  gtk_widget_show (comboAudioDevice);
-  gtk_table_attach (GTK_TABLE (table3), comboAudioDevice, 1, 2, 0, 1,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  entryAudioDevice = GTK_COMBO (comboAudioDevice)->entry;
-  gtk_widget_set_name (entryAudioDevice, "entryAudioDevice");
-  gtk_widget_show (entryAudioDevice);
-  gtk_entry_set_text (GTK_ENTRY (entryAudioDevice), _("/dev/dsp"));
-
-  comboAudioCodec = gtk_combo_new ();
-  g_object_set_data (G_OBJECT (GTK_COMBO (comboAudioCodec)->popwin),
-                     "GladeParentKey", comboAudioCodec);
-  gtk_widget_set_name (comboAudioCodec, "comboAudioCodec");
-  gtk_widget_show (comboAudioCodec);
-  gtk_table_attach (GTK_TABLE (table3), comboAudioCodec, 1, 2, 1, 2,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  comboAudioCodec_items = g_list_append (comboAudioCodec_items, (gpointer) _("raw"));
-  comboAudioCodec_items = g_list_append (comboAudioCodec_items, (gpointer) _("alaw"));
-  comboAudioCodec_items = g_list_append (comboAudioCodec_items, (gpointer) _("ulaw"));
-  gtk_combo_set_popdown_strings (GTK_COMBO (comboAudioCodec), comboAudioCodec_items);
-  g_list_free (comboAudioCodec_items);
-
-  entryAudioCodec = GTK_COMBO (comboAudioCodec)->entry;
-  gtk_widget_set_name (entryAudioCodec, "entryAudioCodec");
-  gtk_widget_show (entryAudioCodec);
-  gtk_entry_set_text (GTK_ENTRY (entryAudioCodec), _("raw"));
-
-  spinAudioBitrate_adj = gtk_adjustment_new (64, 0, 100, 1, 10, 10);
-  spinAudioBitrate = gtk_spin_button_new (GTK_ADJUSTMENT (spinAudioBitrate_adj), 1, 0);
-  gtk_widget_set_name (spinAudioBitrate, "spinAudioBitrate");
-  gtk_widget_show (spinAudioBitrate);
-  gtk_table_attach (GTK_TABLE (table3), spinAudioBitrate, 1, 2, 2, 3,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinAudioBitrate), TRUE);
-
-  label41 = gtk_label_new (_("Audio"));
-  gtk_widget_set_name (label41, "label41");
-  gtk_widget_show (label41);
-  gtk_frame_set_label_widget (GTK_FRAME (frameAudio), label41);
-  gtk_label_set_justify (GTK_LABEL (label41), GTK_JUSTIFY_LEFT);
+  table6 = gtk_table_new (14, 2, FALSE);
+  gtk_widget_set_name (table6, "table6");
+  gtk_widget_show (table6);
+  gtk_container_add (GTK_CONTAINER (viewport5), table6);
 
   hbox14 = gtk_hbox_new (FALSE, 0);
   gtk_widget_set_name (hbox14, "hbox14");
   gtk_widget_show (hbox14);
   gtk_box_pack_start (GTK_BOX (vbox1), hbox14, FALSE, FALSE, 0);
 
-  AddServerToPlaylist = gtk_button_new_with_mnemonic (_("Add to Playlist"));
-  gtk_widget_set_name (AddServerToPlaylist, "AddServerToPlaylist");
-  gtk_widget_show (AddServerToPlaylist);
-  gtk_box_pack_start (GTK_BOX (hbox14), AddServerToPlaylist, FALSE, FALSE, 0);
+  AddTranscodeToPlaylist = gtk_button_new_with_mnemonic (_("Add to Playlist"));
+  gtk_widget_set_name (AddTranscodeToPlaylist, "AddTranscodeToPlaylist");
+  gtk_widget_show (AddTranscodeToPlaylist);
+  gtk_box_pack_start (GTK_BOX (hbox14), AddTranscodeToPlaylist, FALSE, FALSE, 0);
 
   Transcode = gtk_label_new (_("Transcode"));
   gtk_widget_set_name (Transcode, "Transcode");
@@ -1178,47 +1017,44 @@ create_pda (void)
   g_signal_connect ((gpointer) AddNetworkPlaylist, "pressed",
                     G_CALLBACK (onAddNetworkPlaylist),
                     NULL);
-  g_signal_connect ((gpointer) AddCameraToPlaylist, "pressed",
-                    G_CALLBACK (onAddCameraToPlaylist),
-                    NULL);
-  g_signal_connect ((gpointer) entryVideoDevice, "changed",
-                    G_CALLBACK (onVideoDeviceChanged),
+  g_signal_connect ((gpointer) entryV4LVideoDevice, "changed",
+                    G_CALLBACK (V4LBuildMRL),
                     NULL);
-  g_signal_connect ((gpointer) entryVideoDevice, "editing_done",
-                    G_CALLBACK (onEntryVideoDeviceEditingDone),
+  g_signal_connect ((gpointer) entryV4LAudioDevice, "changed",
+                    G_CALLBACK (V4LBuildMRL),
                     NULL);
-  g_signal_connect ((gpointer) entryVideoCodec, "changed",
-                    G_CALLBACK (onVideoCodecChanged),
+  g_signal_connect ((gpointer) entryV4LChannel, "changed",
+                    G_CALLBACK (V4LBuildMRL),
                     NULL);
-  g_signal_connect ((gpointer) entryVideoCodec, "editing_done",
-                    G_CALLBACK (onEntryVideoCodecEditingDone),
+  g_signal_connect ((gpointer) entryV4LNorm, "changed",
+                    G_CALLBACK (V4LBuildMRL),
                     NULL);
-  g_signal_connect ((gpointer) spinVideoBitrate, "changed",
-                    G_CALLBACK (onVideoBitrateChanged),
+  g_signal_connect ((gpointer) entryV4LSize, "changed",
+                    G_CALLBACK (V4LBuildMRL),
                     NULL);
-  g_signal_connect ((gpointer) spinVideoBitrate, "editing_done",
-                    G_CALLBACK (onVideoBitrateEditingDone),
+  g_signal_connect ((gpointer) entryV4LFrequency, "changed",
+                    G_CALLBACK (V4LBuildMRL),
                     NULL);
-  g_signal_connect ((gpointer) entryAudioDevice, "changed",
-                    G_CALLBACK (onAudioDeviceChanged),
+  g_signal_connect ((gpointer) entryV4LSampleRate, "changed",
+                    G_CALLBACK (V4LBuildMRL),
                     NULL);
-  g_signal_connect ((gpointer) entryAudioDevice, "editing_done",
-                    G_CALLBACK (onEntryAudioDeviceEditingDone),
+  g_signal_connect ((gpointer) entryV4LQuality, "changed",
+                    G_CALLBACK (V4LBuildMRL),
                     NULL);
-  g_signal_connect ((gpointer) entryAudioCodec, "changed",
-                    G_CALLBACK (onAudioCodecChanged),
+  g_signal_connect ((gpointer) entryV4LTuner, "changed",
+                    G_CALLBACK (V4LBuildMRL),
                     NULL);
-  g_signal_connect ((gpointer) entryAudioCodec, "editing_done",
-                    G_CALLBACK (onEntryAudioCodecEditingDone),
+  g_signal_connect ((gpointer) entryV4LSoundDirection, "changed",
+                    G_CALLBACK (V4LBuildMRL),
                     NULL);
-  g_signal_connect ((gpointer) spinAudioBitrate, "changed",
-                    G_CALLBACK (onAudioBitrateChanged),
+  g_signal_connect ((gpointer) entryV4LDecimation, "changed",
+                    G_CALLBACK (V4LBuildMRL),
                     NULL);
-  g_signal_connect ((gpointer) spinAudioBitrate, "editing_done",
-                    G_CALLBACK (onAudioBitrateEditingDone),
+  g_signal_connect ((gpointer) AddCameraToPlaylist, "pressed",
+                    G_CALLBACK (onAddCameraToPlaylist),
                     NULL);
-  g_signal_connect ((gpointer) AddServerToPlaylist, "pressed",
-                    G_CALLBACK (onAddServerToPlaylist),
+  g_signal_connect ((gpointer) AddTranscodeToPlaylist, "pressed",
+                    G_CALLBACK (onAddTranscodeToPlaylist),
                     NULL);
   g_signal_connect ((gpointer) tvPlaylist, "event",
                     G_CALLBACK (PlaylistEvent),
@@ -1317,42 +1153,24 @@ create_pda (void)
   GLADE_HOOKUP_OBJECT (pda, entryV4LSampleRate, "entryV4LSampleRate");
   GLADE_HOOKUP_OBJECT (pda, labelV4LQuality, "labelV4LQuality");
   GLADE_HOOKUP_OBJECT (pda, entryV4LQuality, "entryV4LQuality");
-  GLADE_HOOKUP_OBJECT (pda, labelV4lDecimation, "labelV4lDecimation");
-  GLADE_HOOKUP_OBJECT (pda, entryV4LDecimation, "entryV4LDecimation");
   GLADE_HOOKUP_OBJECT (pda, labelV4LTuner, "labelV4LTuner");
   GLADE_HOOKUP_OBJECT (pda, entryV4LTuner, "entryV4LTuner");
+  GLADE_HOOKUP_OBJECT (pda, labelV4LSoundDirection, "labelV4LSoundDirection");
   GLADE_HOOKUP_OBJECT (pda, comboV4LSoundDirection, "comboV4LSoundDirection");
   GLADE_HOOKUP_OBJECT (pda, entryV4LSoundDirection, "entryV4LSoundDirection");
-  GLADE_HOOKUP_OBJECT (pda, labelV4LSound, "labelV4LSound");
+  GLADE_HOOKUP_OBJECT (pda, labelV4LMJPEG, "labelV4LMJPEG");
+  GLADE_HOOKUP_OBJECT (pda, checkV4LMJPEG, "checkV4LMJPEG");
+  GLADE_HOOKUP_OBJECT (pda, labelV4LDecimation, "labelV4LDecimation");
+  GLADE_HOOKUP_OBJECT (pda, entryV4LDecimation, "entryV4LDecimation");
   GLADE_HOOKUP_OBJECT (pda, hbox16, "hbox16");
   GLADE_HOOKUP_OBJECT (pda, AddCameraToPlaylist, "AddCameraToPlaylist");
   GLADE_HOOKUP_OBJECT (pda, Camera, "Camera");
   GLADE_HOOKUP_OBJECT (pda, vbox1, "vbox1");
-  GLADE_HOOKUP_OBJECT (pda, vbox6, "vbox6");
-  GLADE_HOOKUP_OBJECT (pda, frameVideo, "frameVideo");
-  GLADE_HOOKUP_OBJECT (pda, table4, "table4");
-  GLADE_HOOKUP_OBJECT (pda, labelVideoDevice, "labelVideoDevice");
-  GLADE_HOOKUP_OBJECT (pda, labelVideoCodec, "labelVideoCodec");
-  GLADE_HOOKUP_OBJECT (pda, labelVideoBitrate, "labelVideoBitrate");
-  GLADE_HOOKUP_OBJECT (pda, comboVideoDevice, "comboVideoDevice");
-  GLADE_HOOKUP_OBJECT (pda, entryVideoDevice, "entryVideoDevice");
-  GLADE_HOOKUP_OBJECT (pda, comboVideoCodec, "comboVideoCodec");
-  GLADE_HOOKUP_OBJECT (pda, entryVideoCodec, "entryVideoCodec");
-  GLADE_HOOKUP_OBJECT (pda, spinVideoBitrate, "spinVideoBitrate");
-  GLADE_HOOKUP_OBJECT (pda, label42, "label42");
-  GLADE_HOOKUP_OBJECT (pda, frameAudio, "frameAudio");
-  GLADE_HOOKUP_OBJECT (pda, table3, "table3");
-  GLADE_HOOKUP_OBJECT (pda, labelAudioDevice, "labelAudioDevice");
-  GLADE_HOOKUP_OBJECT (pda, labelAudioCodec, "labelAudioCodec");
-  GLADE_HOOKUP_OBJECT (pda, labelAudioBitrate, "labelAudioBitrate");
-  GLADE_HOOKUP_OBJECT (pda, comboAudioDevice, "comboAudioDevice");
-  GLADE_HOOKUP_OBJECT (pda, entryAudioDevice, "entryAudioDevice");
-  GLADE_HOOKUP_OBJECT (pda, comboAudioCodec, "comboAudioCodec");
-  GLADE_HOOKUP_OBJECT (pda, entryAudioCodec, "entryAudioCodec");
-  GLADE_HOOKUP_OBJECT (pda, spinAudioBitrate, "spinAudioBitrate");
-  GLADE_HOOKUP_OBJECT (pda, label41, "label41");
+  GLADE_HOOKUP_OBJECT (pda, scrolledwindowTranscode, "scrolledwindowTranscode");
+  GLADE_HOOKUP_OBJECT (pda, viewport5, "viewport5");
+  GLADE_HOOKUP_OBJECT (pda, table6, "table6");
   GLADE_HOOKUP_OBJECT (pda, hbox14, "hbox14");
-  GLADE_HOOKUP_OBJECT (pda, AddServerToPlaylist, "AddServerToPlaylist");
+  GLADE_HOOKUP_OBJECT (pda, AddTranscodeToPlaylist, "AddTranscodeToPlaylist");
   GLADE_HOOKUP_OBJECT (pda, Transcode, "Transcode");
   GLADE_HOOKUP_OBJECT (pda, vbox4, "vbox4");
   GLADE_HOOKUP_OBJECT (pda, scrolledwindow5, "scrolledwindow5");