# HG changeset patch # User Jonathan Schleifer # Date 1190891698 -7200 # Node ID 4505dec6560af61d77d3651de6bc917b65df270f # Parent a5a81f8d6fd7124c254de8146494809d4fad89c8# Parent fa9053478e0b0a73c6f325178a6f3a29851dd37d Automated merge with ssh://sidhe.atheme.org//hg/audacious diff -r a5a81f8d6fd7 -r 4505dec6560a Makefile --- 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 diff -r a5a81f8d6fd7 -r 4505dec6560a applications/audacious.desktop.in --- /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 diff -r a5a81f8d6fd7 -r 4505dec6560a configure.ac --- 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 ]) diff -r a5a81f8d6fd7 -r 4505dec6560a src/audacious/audacious.desktop.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 diff -r a5a81f8d6fd7 -r 4505dec6560a src/audacious/glade/prefswin.glade --- 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 @@ False False True - True True @@ -133,9 +132,6 @@ - - False - @@ -147,7 +143,6 @@ tab - False False @@ -238,7 +233,6 @@ 1 - False @@ -250,7 +244,6 @@ tab 1 - False False @@ -341,7 +334,6 @@ 2 - False @@ -353,7 +345,6 @@ tab 2 - False False @@ -444,7 +435,6 @@ 3 - False @@ -456,16 +446,12 @@ tab 3 - False False - - False - @@ -474,7 +460,6 @@ tab - False False @@ -881,7 +866,6 @@ 1 - False @@ -892,7 +876,6 @@ tab 1 - False False @@ -1038,7 +1021,6 @@ 2 - False @@ -1049,7 +1031,6 @@ tab 2 - False False @@ -1552,7 +1533,6 @@ 3 - False @@ -1563,7 +1543,6 @@ tab 3 - False False @@ -1760,7 +1739,6 @@ 4 - False @@ -1771,7 +1749,6 @@ tab 4 - False False @@ -2038,7 +2015,6 @@ 5 - False @@ -2048,7 +2024,6 @@ tab 5 - False False @@ -2062,678 +2037,685 @@ tab 6 - False False - + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_NEVER - + True - 12 - + True - 0 - Audio System - True + 12 + + + True + 0 + Audio System + True + + + + False + False + - - - False - False - - - - - True - 6 - 12 - + True + 6 + 12 - + True - 3 - 2 - 6 - 6 - + True - 0 - Current output plugin: - - - - - - - - - True - - + 3 + 2 + 6 + 6 + + + True + 1 + 0 + gtk-info + + + 2 + 3 + GTK_FILL + + + + + True + 1 + Buffer size: + + + 1 + 2 + + + + + + True + 0 + 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. + True + True + + + 1 + 2 + 2 + 3 + + + + + + + True + True + 0 0 600000 100 1000 1000 + 1 + + + + + 1 + 2 + 1 + 2 + + + + + + True + + + + + 1 + 2 + + + + + + True + 0 + Current output plugin: + + + + + + - 1 - 2 - - - - - - True - True - 0 0 600000 100 1000 1000 - 1 - - - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - 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. - True - True - - - 1 - 2 - 2 - 3 - - - - - - - True - 1 - Buffer size: - - - 1 - 2 - - - - - - True - 1 - 0 - gtk-info - - - 2 - 3 - GTK_FILL + False + False - - False - False - + + False + False + 1 + - - - False - False - 1 - - - - - True - 12 - + True - 8 - GTK_BUTTONBOX_START + 12 - + True - False - True - True - 0 + 8 + GTK_BUTTONBOX_START - + True - 0 - 0 + False + True + True + 0 - + True - 2 + 0 + 0 - + True - gtk-preferences - - - False - False - - - - - True - Output Plugin Preferences - True + 2 + + + True + gtk-preferences + + + False + False + + + + + True + Output Plugin Preferences + True + + + False + False + 1 + + - - False - False - 1 - - - - - - - - - - - True - False - True - True - 0 - - - True - 0 - 0 - - - True - 2 - - - True - gtk-about - - - False - False - - - - - True - Output Plugin Information - True - - - False - False - 1 - + + + True + False + True + True + 0 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-about + + + False + False + + + + + True + Output Plugin Information + True + + + False + False + 1 + + + + + + + + + 1 + + - - 1 - + + + + False + False + 2 + + + + + True + 12 + 12 + + + True + 0 + Format Detection + True + + + + + False + False + 3 + + + + + True + 12 + + + True + True + When checked, Audacious will detect file formats on demand. This can result in a messier playlist, but delivers a major speed benefit. + Detect file formats on demand, instead of immediately. + True + 0 + True + + + - - - - False - False - 2 - - - - - True - 12 - 12 - - - True - 0 - Format Detection - True - - - - - False - False - 3 - - - - - True - 12 - - - True - True - When checked, Audacious will detect file formats on demand. This can result in a messier playlist, but delivers a major speed benefit. - Detect file formats on demand, instead of immediately. - True - 0 - True - - - - - - - False - False - 4 - - - - - True - 12 - - - True - True - 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. - Detect file formats by extension. - True - 0 - True - - - - - - - False - False - 5 - - - - - True - 12 - 12 - - - True - 0 - Playback - True - + + False + False + 4 + - - - False - False - 6 - - - - - True - 12 - + True - True - When Audacious starts, automatically begin playing from the point where we stopped before. - Continue playback on startup - True - 0 - True - - + 12 + + + True + True + 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. + Detect file formats by extension. + True + 0 + True + + + + - - - - False - False - 7 - - - - - True - 12 - - - True - True - When finished playing a song, don't automatically advance to the next. - Don't advance in the playlist - True - 0 - True - - - + + False + False + 5 + - - - False - False - 8 - - - - - True - 12 - + True - True - Pause between songs - True - 0 - True + 12 + 12 + + + True + 0 + Playback + True + + + + False + False + 6 + - - - False - False - 9 - - - - - True - 45 - + True + 12 - - True - 4 - Pause for - - - False - False - - - - + True True - 2 0 100 1 10 10 - 1 - - + When Audacious starts, automatically begin playing from the point where we stopped before. + Continue playback on startup + True + 0 + True + + - - False - False - 1 - + + + False + False + 7 + + + + + True + 12 - + True - 4 - seconds + True + When finished playing a song, don't automatically advance to the next. + Don't advance in the playlist + True + 0 + True + + - - False - False - 2 - + + False + False + 8 + - - - False - False - 10 - - - - - True - 12 - 12 - - True - 0 - Sampling Rate Converter - True - - - - - False - False - 11 - - - - - True - 12 - - + True - True - Enable Sampling Rate Converter - True - 0 - True - True - - + 12 + + + True + True + Pause between songs + True + 0 + True + + + + False + False + 9 + - - - False - False - 12 - - - - - True - 6 - 12 - + True + 45 - + True - 3 - 2 - 6 - 6 - + True - 0 - Sampling Rate [Hz]: + 4 + Pause for - GTK_FILL - + False + False - + True True - 96000 1000 768000 1000 1000 1000 + 2 0 100 1 10 10 1 - - + + - 1 - 2 - - - - - - True - 1 - 0 - gtk-info - - - 2 - 3 - GTK_FILL + False + False + 1 - + True - 0 - All streams will be converted to this sampling rate. -This should be the max supported sampling rate of -the sound card or output plugin. - True - True + 4 + seconds - 1 - 2 - 2 - 3 - GTK_FILL - + False + False + 2 + + + + + False + False + 10 + + + + + True + 12 + 12 + + + True + 0 + Sampling Rate Converter + True + + + + + False + False + 11 + + + + + True + 12 + + + True + True + Enable Sampling Rate Converter + True + 0 + True + True + + + + + + + False + False + 12 + + + + + True + 6 + 12 + + + True - + True - 0 - Interpolation Engine: - - - 1 - 2 - GTK_FILL - - - - - - True - Best Sinc Interpolation + 3 + 2 + 6 + 6 + + + True + Best Sinc Interpolation Medium Sinc Interpolation Fastest Sinc Interpolation ZOH Interpolation Linear Interpolation - - + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + Interpolation Engine: + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + All streams will be converted to this sampling rate. +This should be the max supported sampling rate of +the sound card or output plugin. + True + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + 1 + 0 + gtk-info + + + 2 + 3 + GTK_FILL + + + + + True + True + 96000 1000 768000 1000 1000 1000 + 1 + + + + + 1 + 2 + + + + + + True + 0 + Sampling Rate [Hz]: + + + GTK_FILL + + + - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL + False + False - - False - False - + + + + False + False + 13 + + + + + True + 12 + 12 + + + True + 0 + Volume Control + True + + + False + False + 14 + - - - False - False - 13 - - - - - True - 12 - 12 - + True - 0 - Volume Control - True + 12 + + + True + True + Use software volume control. This may be useful for situations where your audio system does not support controlling the playback volume. + Use software volume control + True + 0 + True + + + + + + False + False + 15 + - - False - False - 14 - - - - - True - 12 - - - True - True - Use software volume control. This may be useful for situations where your audio system does not support controlling the playback volume. - Use software volume control - True - 0 - True - - - - - - - False - False - 15 - 7 - False + True @@ -2743,7 +2725,6 @@ tab 7 - False False @@ -2757,7 +2738,6 @@ tab 8 - False False diff -r a5a81f8d6fd7 -r 4505dec6560a src/audacious/ui_fileopener.c --- a/src/audacious/ui_fileopener.c Thu Sep 27 13:14:34 2007 +0200 +++ b/src/audacious/ui_fileopener.c Thu Sep 27 13:14:58 2007 +0200 @@ -35,7 +35,6 @@ { GSList *cur; gchar *ptr; - guint ctr = 0; Playlist *playlist = playlist_get_active(); for (cur = files; cur; cur = g_slist_next(cur)) {