Mercurial > audlegacy
changeset 4324:360c934b9330
Automated merge with ssh://hg.atheme.org//hg/audacious
| author | Eugene Zagidullin <e.asphyx@gmail.com> |
|---|---|
| date | Thu, 13 Mar 2008 01:43:19 +0300 |
| parents | 04ade98fafa3 (current diff) e960a507509d (diff) |
| children | 309e8f970517 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/Makefile Thu Mar 13 01:42:59 2008 +0300 +++ b/src/audacious/Makefile Thu Mar 13 01:43:19 2008 +0300 @@ -188,6 +188,8 @@ if [ -d ../../.hg ]; then \ revh=`hg tip --template 'const char *svn_stamp = "#rev#:#node|short#";\n' 2>/dev/null`; \ [ -z "$$revh" ] || echo "$$revh" > build_stamp.c; \ + else \ + echo "const char *svn_stamp = \"UNSUPPORTED VERSION\";" > build_stamp.c; \ fi DBUS_BINDINGS_SOURCES = objects.xml \
--- a/src/audacious/ui_main.c Thu Mar 13 01:42:59 2008 +0300 +++ b/src/audacious/ui_main.c Thu Mar 13 01:43:19 2008 +0300 @@ -144,8 +144,6 @@ GtkWidget *mainwin_minus_num, *mainwin_10min_num, *mainwin_min_num; GtkWidget *mainwin_10sec_num, *mainwin_sec_num; -static gboolean setting_volume = FALSE; - GtkWidget *mainwin_vis; GtkWidget *mainwin_svis; @@ -1596,8 +1594,6 @@ { gchar *volume_msg; - setting_volume = TRUE; - volume_msg = g_strdup_printf(_("Volume: %d%%"), v); mainwin_lock_info_text(volume_msg); g_free(volume_msg); @@ -1614,7 +1610,6 @@ mainwin_adjust_volume_release(void) { mainwin_release_info_text(); - setting_volume = FALSE; } void @@ -1623,7 +1618,6 @@ gchar *balance_msg; gint v, pvl, pvr; - setting_volume = TRUE; balance = b; input_get_volume(&pvl, &pvr); v = MAX(pvl, pvr); @@ -1647,7 +1641,6 @@ mainwin_adjust_balance_release(void) { mainwin_release_info_text(); - setting_volume = FALSE; } void @@ -1707,7 +1700,6 @@ vol = CLAMP(vol + diff, 0, 100); mainwin_adjust_volume_motion(vol); - setting_volume = FALSE; mainwin_set_volume_slider(vol); equalizerwin_set_volume_slider(vol); @@ -1722,7 +1714,6 @@ gint b; b = CLAMP(balance + diff, -100, 100); mainwin_adjust_balance_motion(b); - setting_volume = FALSE; mainwin_set_balance_slider(b); equalizerwin_set_balance_slider(b); }