comparison src/skins/ui_main.c @ 3029:9c0673583d73

Don't change config just because time remaining can't be shown for an internet stream (Debian bug #500081)
author John Lindgren <john.lindgren@tds.net>
date Fri, 10 Apr 2009 01:34:22 -0400
parents 963796db51ea
children b0f8da03187b
comparison
equal deleted inserted replaced
3028:b20622733f08 3029:9c0673583d73
69 #include "ui_skinned_playlist.h" 69 #include "ui_skinned_playlist.h"
70 #include "ui_main_evlisteners.h" 70 #include "ui_main_evlisteners.h"
71 #include <audlegacy/plugin.h> 71 #include <audlegacy/plugin.h>
72 #include "skins_cfg.h" 72 #include "skins_cfg.h"
73 73
74 static GTimeVal cb_time; 74 static GTimeVal cb_time;
75 static const int TRISTATE_THRESHOLD = 200; 75 static const int TRISTATE_THRESHOLD = 200;
76 76
77 enum { 77 enum {
78 MAINWIN_SEEK_REV = -1, 78 MAINWIN_SEEK_REV = -1,
79 MAINWIN_SEEK_NIL, 79 MAINWIN_SEEK_NIL,
1167 gtk_box_pack_start( GTK_BOX(vbox) , label , TRUE , TRUE , 0 ); 1167 gtk_box_pack_start( GTK_BOX(vbox) , label , TRUE , TRUE , 0 );
1168 gtk_box_pack_start( GTK_BOX(vbox) , checkbt , TRUE , TRUE , 0 ); 1168 gtk_box_pack_start( GTK_BOX(vbox) , checkbt , TRUE , TRUE , 0 );
1169 g_signal_connect( G_OBJECT(checkbt) , "toggled" , 1169 g_signal_connect( G_OBJECT(checkbt) , "toggled" ,
1170 G_CALLBACK(on_broken_gtk_engine_warning_toggle) , NULL ); 1170 G_CALLBACK(on_broken_gtk_engine_warning_toggle) , NULL );
1171 g_signal_connect( G_OBJECT(warning_dlg) , "response" , 1171 g_signal_connect( G_OBJECT(warning_dlg) , "response" ,
1172 G_CALLBACK(gtk_widget_destroy) , NULL ); 1172 G_CALLBACK(gtk_widget_destroy) , NULL );
1173 gtk_widget_show_all(warning_dlg); 1173 gtk_widget_show_all(warning_dlg);
1174 gtk_window_stick(GTK_WINDOW(warning_dlg)); 1174 gtk_window_stick(GTK_WINDOW(warning_dlg));
1175 } 1175 }
1176 1176
1177 config.disable_inline_gtk = TRUE; 1177 config.disable_inline_gtk = TRUE;
2382 gint t; 2382 gint t;
2383 gchar stime_prefix; 2383 gchar stime_prefix;
2384 2384
2385 if (ab_position_a != -1 && ab_position_b != -1 && time > ab_position_b) 2385 if (ab_position_a != -1 && ab_position_b != -1 && time > ab_position_b)
2386 audacious_drct_seek(ab_position_a/1000); 2386 audacious_drct_seek(ab_position_a/1000);
2387
2388 if (length == -1 && config.timer_mode == TIMER_REMAINING)
2389 config.timer_mode = TIMER_ELAPSED;
2390 2387
2391 playlistwin_set_time(time, length, config.timer_mode); 2388 playlistwin_set_time(time, length, config.timer_mode);
2392 2389
2393 if (config.timer_mode == TIMER_REMAINING) { 2390 if (config.timer_mode == TIMER_REMAINING) {
2394 if (length != -1) { 2391 if (length != -1) {