Mercurial > audlegacy
changeset 3652:4505dec6560a
Automated merge with ssh://sidhe.atheme.org//hg/audacious
| author | Jonathan Schleifer <js@h3c.de> |
|---|---|
| date | Thu, 27 Sep 2007 13:14:58 +0200 |
| parents | a5a81f8d6fd7 (current diff) fa9053478e0b (diff) |
| children | b88ebc1c564f |
| files | configure.ac src/audacious/audacious.desktop.in |
| diffstat | 6 files changed, 578 insertions(+), 597 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Sep 27 13:14:34 2007 +0200 +++ b/Makefile Thu Sep 27 13:14:58 2007 +0200 @@ -101,7 +101,8 @@ Skins/Refugee/text.png \ Skins/Refugee/titlebar.png \ Skins/Refugee/viscolor.txt \ - Skins/Refugee/volume.png + Skins/Refugee/volume.png \ + applications/audacious.desktop DISTCLEAN = extra.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/applications/audacious.desktop.in Thu Sep 27 13:14:58 2007 +0200 @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Audacious +GenericName=Audio Player +Comment=Play music +Comment[hu]=Zene lejátszása +Exec=audacious %U +Icon=audacious +MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg +Categories=Application;GTK;AudioVideo;Player; +Terminal=false +Type=Application +Encoding=UTF-8
--- a/configure.ac Thu Sep 27 13:14:34 2007 +0200 +++ b/configure.ac Thu Sep 27 13:14:58 2007 +0200 @@ -1,3 +1,4 @@ + dnl Process this file with autoconf to produce a configure script. AC_INIT([audacious], [1.4.0], [bugs+audacious@atheme.org]) AC_PREREQ([2.59]) @@ -442,7 +443,7 @@ extra.mk man/audtool.1 man/audacious.1 - src/audacious/audacious.desktop + applications/audacious.desktop po/Makefile.in ])
--- a/src/audacious/audacious.desktop.in Thu Sep 27 13:14:34 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=Audacious -GenericName=Audio Player -Comment=Play music -Comment[hu]=Zene lejátszása -Exec=audacious %U -Icon=audacious -MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/mpegurl;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-wav;audio/x-xm;application/ogg;audio/x-vorbis+ogg -Categories=Application;GTK;AudioVideo;Player; -Terminal=false -Type=Application -Encoding=UTF-8
--- a/src/audacious/glade/prefswin.glade Thu Sep 27 13:14:34 2007 +0200 +++ b/src/audacious/glade/prefswin.glade Thu Sep 27 13:14:58 2007 +0200 @@ -39,7 +39,6 @@ <property name="show_tabs">False</property> <property name="show_border">False</property> <property name="scrollable">True</property> - <property name="enable_popup">True</property> <child> <widget class="GtkVBox" id="plugin_page_vbox"> <property name="visible">True</property> @@ -133,9 +132,6 @@ </packing> </child> </widget> - <packing> - <property name="tab_expand">False</property> - </packing> </child> <child> <widget class="GtkLabel" id="plugin_input_label"> @@ -147,7 +143,6 @@ </widget> <packing> <property name="type">tab</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -238,7 +233,6 @@ </widget> <packing> <property name="position">1</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -250,7 +244,6 @@ <packing> <property name="type">tab</property> <property name="position">1</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -341,7 +334,6 @@ </widget> <packing> <property name="position">2</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -353,7 +345,6 @@ <packing> <property name="type">tab</property> <property name="position">2</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -444,7 +435,6 @@ </widget> <packing> <property name="position">3</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -456,16 +446,12 @@ <packing> <property name="type">tab</property> <property name="position">3</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> </widget> </child> </widget> - <packing> - <property name="tab_expand">False</property> - </packing> </child> <child> <widget class="GtkLabel" id="plugin_label"> @@ -474,7 +460,6 @@ </widget> <packing> <property name="type">tab</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -881,7 +866,6 @@ </widget> <packing> <property name="position">1</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -892,7 +876,6 @@ <packing> <property name="type">tab</property> <property name="position">1</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -1038,7 +1021,6 @@ </widget> <packing> <property name="position">2</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -1049,7 +1031,6 @@ <packing> <property name="type">tab</property> <property name="position">2</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -1552,7 +1533,6 @@ </widget> <packing> <property name="position">3</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -1563,7 +1543,6 @@ <packing> <property name="type">tab</property> <property name="position">3</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -1760,7 +1739,6 @@ </widget> <packing> <property name="position">4</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -1771,7 +1749,6 @@ <packing> <property name="type">tab</property> <property name="position">4</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -2038,7 +2015,6 @@ </widget> <packing> <property name="position">5</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -2048,7 +2024,6 @@ <packing> <property name="type">tab</property> <property name="position">5</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -2062,678 +2037,685 @@ <packing> <property name="type">tab</property> <property name="position">6</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkVBox" id="vbox32"> + <widget class="GtkScrolledWindow" id="audio_scrolled_window"> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> <child> - <widget class="GtkAlignment" id="alignment74"> + <widget class="GtkVBox" id="audio_page_vbox"> <property name="visible">True</property> - <property name="bottom_padding">12</property> <child> - <widget class="GtkLabel" id="label77"> + <widget class="GtkAlignment" id="alignment74"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Audio System</b></property> - <property name="use_markup">True</property> + <property name="bottom_padding">12</property> + <child> + <widget class="GtkLabel" id="label77"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Audio System</b></property> + <property name="use_markup">True</property> + </widget> + </child> </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment73"> - <property name="visible">True</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox33"> + <widget class="GtkAlignment" id="alignment73"> <property name="visible">True</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> <child> - <widget class="GtkTable" id="table11"> + <widget class="GtkVBox" id="vbox33"> <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> - <property name="column_spacing">6</property> - <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label78"> + <widget class="GtkTable" id="table11"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Current output plugin:</property> - </widget> - <packing> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkComboBox" id="output_plugin_cbox"> - <property name="visible">True</property> - <property name="items" translatable="yes"></property> - <signal name="realize" handler="on_output_plugin_cbox_realize" after="yes"/> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <child> + <widget class="GtkImage" id="image7"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="stock">gtk-info</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label79"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Buffer size:</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label82"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><span size="small">This is the amount of time to prebuffer audio streams by, in milliseconds. +Increase this value if you are experiencing audio skipping. +Please note however, that high values will result in Audacious performing poorly.</span></property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </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="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkSpinButton" id="output_plugin_bufsize"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">0 0 600000 100 1000 1000</property> + <property name="climb_rate">1</property> + <signal name="value_changed" handler="on_output_plugin_bufsize_value_changed"/> + <signal name="realize" handler="on_output_plugin_bufsize_realize" after="yes"/> + </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="GtkComboBox" id="output_plugin_cbox"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <signal name="realize" handler="on_output_plugin_cbox_realize" after="yes"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label78"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Current output plugin:</property> + </widget> + <packing> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkSpinButton" id="output_plugin_bufsize"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">0 0 600000 100 1000 1000</property> - <property name="climb_rate">1</property> - <signal name="value_changed" handler="on_output_plugin_bufsize_value_changed"/> - <signal name="realize" handler="on_output_plugin_bufsize_realize" after="yes"/> - </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="GtkLabel" id="label82"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><span size="small">This is the amount of time to prebuffer audio streams by, in milliseconds. -Increase this value if you are experiencing audio skipping. -Please note however, that high values will result in Audacious performing poorly.</span></property> - <property name="use_markup">True</property> - <property name="wrap">True</property> - </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="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label79"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">Buffer size:</property> - </widget> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkImage" id="image7"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="stock">gtk-info</property> - </widget> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> </child> </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment82"> - <property name="visible">True</property> - <property name="left_padding">12</property> <child> - <widget class="GtkHButtonBox" id="output_plugin_button_box"> + <widget class="GtkAlignment" id="alignment82"> <property name="visible">True</property> - <property name="spacing">8</property> - <property name="layout_style">GTK_BUTTONBOX_START</property> + <property name="left_padding">12</property> <child> - <widget class="GtkButton" id="output_plugin_prefs"> + <widget class="GtkHButtonBox" id="output_plugin_button_box"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="response_id">0</property> + <property name="spacing">8</property> + <property name="layout_style">GTK_BUTTONBOX_START</property> <child> - <widget class="GtkAlignment" id="alignment76"> + <widget class="GtkButton" id="output_plugin_prefs"> <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="response_id">0</property> <child> - <widget class="GtkHBox" id="hbox7"> + <widget class="GtkAlignment" id="alignment76"> <property name="visible">True</property> - <property name="spacing">2</property> + <property name="xscale">0</property> + <property name="yscale">0</property> <child> - <widget class="GtkImage" id="image5"> + <widget class="GtkHBox" id="hbox7"> <property name="visible">True</property> - <property name="stock">gtk-preferences</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label80"> - <property name="visible">True</property> - <property name="label" translatable="yes">Output Plugin Preferences</property> - <property name="use_underline">True</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="stock">gtk-preferences</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label80"> + <property name="visible">True</property> + <property name="label" translatable="yes">Output Plugin Preferences</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkButton" id="output_plugin_info"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="response_id">0</property> - <child> - <widget class="GtkAlignment" id="alignment77"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <widget class="GtkHBox" id="hbox8"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <widget class="GtkImage" id="image6"> - <property name="visible">True</property> - <property name="stock">gtk-about</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label81"> - <property name="visible">True</property> - <property name="label" translatable="yes">Output Plugin Information</property> - <property name="use_underline">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </widget> </child> </widget> </child> + <child> + <widget class="GtkButton" id="output_plugin_info"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="response_id">0</property> + <child> + <widget class="GtkAlignment" id="alignment77"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <widget class="GtkHBox" id="hbox8"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="image6"> + <property name="visible">True</property> + <property name="stock">gtk-about</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label81"> + <property name="visible">True</property> + <property name="label" translatable="yes">Output Plugin Information</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> </widget> - <packing> - <property name="position">1</property> - </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkAlignment" id="alignment78"> + <property name="visible">True</property> + <property name="top_padding">12</property> + <property name="bottom_padding">12</property> + <child> + <widget class="GtkLabel" id="label83"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Format Detection</b></property> + <property name="use_markup">True</property> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <widget class="GtkAlignment" id="alignment84"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkCheckButton" id="audio_format_det_cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">When checked, Audacious will detect file formats on demand. This can result in a messier playlist, but delivers a major speed benefit.</property> + <property name="label" translatable="yes">Detect file formats on demand, instead of immediately.</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_audio_format_det_cb_toggled"/> + <signal name="realize" handler="on_audio_format_det_cb_realize"/> + </widget> </child> </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment78"> - <property name="visible">True</property> - <property name="top_padding">12</property> - <property name="bottom_padding">12</property> - <child> - <widget class="GtkLabel" id="label83"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Format Detection</b></property> - <property name="use_markup">True</property> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment84"> - <property name="visible">True</property> - <property name="left_padding">12</property> - <child> - <widget class="GtkCheckButton" id="audio_format_det_cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">When checked, Audacious will detect file formats on demand. This can result in a messier playlist, but delivers a major speed benefit.</property> - <property name="label" translatable="yes">Detect file formats on demand, instead of immediately.</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_audio_format_det_cb_toggled"/> - <signal name="realize" handler="on_audio_format_det_cb_realize"/> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment89"> - <property name="visible">True</property> - <property name="left_padding">12</property> - <child> - <widget class="GtkCheckButton" id="detect_by_extension_cb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">When checked, Audacious will detect file formats based by extension. This is slightly slower than detection on demand, but still provides a minimal level of format detection.</property> - <property name="label" translatable="yes">Detect file formats by extension.</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_detect_by_extension_cb_toggled"/> - <signal name="realize" handler="on_detect_by_extension_cb_realize"/> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">5</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment19"> - <property name="visible">True</property> - <property name="top_padding">12</property> - <property name="bottom_padding">12</property> - <child> - <widget class="GtkLabel" id="label40"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Playback</b></property> - <property name="use_markup">True</property> - </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">6</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment83"> - <property name="visible">True</property> - <property name="left_padding">12</property> <child> - <widget class="GtkCheckButton" id="continue_playback_on_startup"> + <widget class="GtkAlignment" id="alignment89"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">When Audacious starts, automatically begin playing from the point where we stopped before.</property> - <property name="label" translatable="yes">Continue playback on startup</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_continue_playback_on_startup_toggled"/> - <signal name="realize" handler="on_continue_playback_on_startup_realize"/> + <property name="left_padding">12</property> + <child> + <widget class="GtkCheckButton" id="detect_by_extension_cb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">When checked, Audacious will detect file formats based by extension. This is slightly slower than detection on demand, but still provides a minimal level of format detection.</property> + <property name="label" translatable="yes">Detect file formats by extension.</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_detect_by_extension_cb_toggled"/> + <signal name="realize" handler="on_detect_by_extension_cb_realize"/> + </widget> + </child> </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">7</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment79"> - <property name="visible">True</property> - <property name="left_padding">12</property> - <child> - <widget class="GtkCheckButton" id="playlist_no_advance"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">When finished playing a song, don't automatically advance to the next.</property> - <property name="label" translatable="yes">Don't advance in the playlist</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_playlist_no_advance_toggled"/> - <signal name="realize" handler="on_playlist_no_advance_realize" after="yes"/> - </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">5</property> + </packing> </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">8</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment80"> - <property name="visible">True</property> - <property name="left_padding">12</property> <child> - <widget class="GtkCheckButton" id="pause_between_songs"> + <widget class="GtkAlignment" id="alignment19"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Pause between songs</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> + <property name="top_padding">12</property> + <property name="bottom_padding">12</property> + <child> + <widget class="GtkLabel" id="label40"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Playback</b></property> + <property name="use_markup">True</property> + </widget> + </child> </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">6</property> + </packing> </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">9</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment22"> - <property name="visible">True</property> - <property name="left_padding">45</property> <child> - <widget class="GtkHBox" id="pause_between_songs_box"> + <widget class="GtkAlignment" id="alignment83"> <property name="visible">True</property> + <property name="left_padding">12</property> <child> - <widget class="GtkLabel" id="label41"> - <property name="visible">True</property> - <property name="xpad">4</property> - <property name="label" translatable="yes">Pause for</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkSpinButton" id="pause_between_songs_time"> + <widget class="GtkCheckButton" id="continue_playback_on_startup"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">2 0 100 1 10 10</property> - <property name="climb_rate">1</property> - <signal name="value_changed" handler="on_pause_between_songs_time_changed"/> - <signal name="realize" handler="on_pause_between_songs_time_realize" after="yes"/> + <property name="tooltip" translatable="yes">When Audacious starts, automatically begin playing from the point where we stopped before.</property> + <property name="label" translatable="yes">Continue playback on startup</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_continue_playback_on_startup_toggled"/> + <signal name="realize" handler="on_continue_playback_on_startup_realize"/> </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">7</property> + </packing> + </child> + <child> + <widget class="GtkAlignment" id="alignment79"> + <property name="visible">True</property> + <property name="left_padding">12</property> <child> - <widget class="GtkLabel" id="label42"> + <widget class="GtkCheckButton" id="playlist_no_advance"> <property name="visible">True</property> - <property name="xpad">4</property> - <property name="label" translatable="yes">seconds</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">When finished playing a song, don't automatically advance to the next.</property> + <property name="label" translatable="yes">Don't advance in the playlist</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_playlist_no_advance_toggled"/> + <signal name="realize" handler="on_playlist_no_advance_realize" after="yes"/> </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> </child> </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">8</property> + </packing> </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">10</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment90"> - <property name="visible">True</property> - <property name="top_padding">12</property> - <property name="bottom_padding">12</property> <child> - <widget class="GtkLabel" id="label93"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Sampling Rate Converter</b></property> - <property name="use_markup">True</property> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">11</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment92"> - <property name="visible">True</property> - <property name="left_padding">12</property> - <child> - <widget class="GtkCheckButton" id="enable_src"> + <widget class="GtkAlignment" id="alignment80"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Enable Sampling Rate Converter</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_enable_src_toggled"/> - <signal name="realize" handler="on_enable_src_realize"/> + <property name="left_padding">12</property> + <child> + <widget class="GtkCheckButton" id="pause_between_songs"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Pause between songs</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + </widget> + </child> </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">9</property> + </packing> </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">12</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment91"> - <property name="visible">True</property> - <property name="bottom_padding">6</property> - <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox36"> + <widget class="GtkAlignment" id="alignment22"> <property name="visible">True</property> + <property name="left_padding">45</property> <child> - <widget class="GtkTable" id="table13"> + <widget class="GtkHBox" id="pause_between_songs_box"> <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> - <property name="column_spacing">6</property> - <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label91"> + <widget class="GtkLabel" id="label41"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Sampling Rate [Hz]:</property> + <property name="xpad">4</property> + <property name="label" translatable="yes">Pause for</property> </widget> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="src_rate"> + <widget class="GtkSpinButton" id="pause_between_songs_time"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">96000 1000 768000 1000 1000 1000</property> + <property name="adjustment">2 0 100 1 10 10</property> <property name="climb_rate">1</property> - <signal name="value_changed" handler="on_src_rate_value_changed"/> - <signal name="realize" handler="on_src_rate_realize"/> + <signal name="value_changed" handler="on_pause_between_songs_time_changed"/> + <signal name="realize" handler="on_pause_between_songs_time_realize" after="yes"/> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkImage" id="image9"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="stock">gtk-info</property> - </widget> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> </packing> </child> <child> - <widget class="GtkLabel" id="label92"> + <widget class="GtkLabel" id="label42"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><span size="small">All streams will be converted to this sampling rate. -This should be the max supported sampling rate of -the sound card or output plugin.</span></property> - <property name="use_markup">True</property> - <property name="wrap">True</property> + <property name="xpad">4</property> + <property name="label" translatable="yes">seconds</property> </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="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> </packing> </child> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">10</property> + </packing> + </child> + <child> + <widget class="GtkAlignment" id="alignment90"> + <property name="visible">True</property> + <property name="top_padding">12</property> + <property name="bottom_padding">12</property> + <child> + <widget class="GtkLabel" id="label93"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Sampling Rate Converter</b></property> + <property name="use_markup">True</property> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">11</property> + </packing> + </child> + <child> + <widget class="GtkAlignment" id="alignment92"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkCheckButton" id="enable_src"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Enable Sampling Rate Converter</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_enable_src_toggled"/> + <signal name="realize" handler="on_enable_src_realize"/> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">12</property> + </packing> + </child> + <child> + <widget class="GtkAlignment" id="alignment91"> + <property name="visible">True</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkVBox" id="vbox36"> + <property name="visible">True</property> <child> - <widget class="GtkLabel" id="label94"> + <widget class="GtkTable" id="table13"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Interpolation Engine:</property> - </widget> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkComboBox" id="src_converter_type"> - <property name="visible">True</property> - <property name="items">Best Sinc Interpolation + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <child> + <widget class="GtkComboBox" id="src_converter_type"> + <property name="visible">True</property> + <property name="items">Best Sinc Interpolation Medium Sinc Interpolation Fastest Sinc Interpolation ZOH Interpolation Linear Interpolation</property> - <signal name="changed" handler="on_src_converter_type_changed"/> - <signal name="realize" handler="on_src_converter_type_realize" after="yes"/> + <signal name="changed" handler="on_src_converter_type_changed"/> + <signal name="realize" handler="on_src_converter_type_realize" after="yes"/> + </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="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label94"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Interpolation Engine:</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label92"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><span size="small">All streams will be converted to this sampling rate. +This should be the max supported sampling rate of +the sound card or output plugin.</span></property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </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="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkImage" id="image9"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="stock">gtk-info</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkSpinButton" id="src_rate"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">96000 1000 768000 1000 1000 1000</property> + <property name="climb_rate">1</property> + <signal name="value_changed" handler="on_src_rate_value_changed"/> + <signal name="realize" handler="on_src_rate_realize"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label91"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Sampling Rate [Hz]:</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </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="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">13</property> + </packing> + </child> + <child> + <widget class="GtkAlignment" id="alignment4"> + <property name="visible">True</property> + <property name="top_padding">12</property> + <property name="bottom_padding">12</property> + <child> + <widget class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Volume Control</b></property> + <property name="use_markup">True</property> + </widget> </child> </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">14</property> + </packing> </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">13</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="top_padding">12</property> - <property name="bottom_padding">12</property> <child> - <widget class="GtkLabel" id="label2"> + <widget class="GtkAlignment" id="alignment7"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Volume Control</b></property> - <property name="use_markup">True</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkCheckButton" id="software_volume_control"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Use software volume control. This may be useful for situations where your audio system does not support controlling the playback volume.</property> + <property name="label" translatable="yes">Use software volume control</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_software_volume_control_toggled"/> + <signal name="realize" handler="on_software_volume_control_realize"/> + </widget> + </child> </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">15</property> + </packing> </child> </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">14</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment7"> - <property name="visible">True</property> - <property name="left_padding">12</property> - <child> - <widget class="GtkCheckButton" id="software_volume_control"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Use software volume control. This may be useful for situations where your audio system does not support controlling the playback volume.</property> - <property name="label" translatable="yes">Use software volume control</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_software_volume_control_toggled"/> - <signal name="realize" handler="on_software_volume_control_realize"/> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">15</property> - </packing> </child> </widget> <packing> <property name="position">7</property> - <property name="tab_expand">False</property> + <property name="tab_expand">True</property> </packing> </child> <child> @@ -2743,7 +2725,6 @@ <packing> <property name="type">tab</property> <property name="position">7</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -2757,7 +2738,6 @@ <packing> <property name="type">tab</property> <property name="position">8</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child>