comparison src/audacious/genevent.c @ 3001:6d4b7b739232 trunk

fully implement UiSkinnedNumber, number.c no longer needed
author Tomasz Mon <desowin@gmail.com>
date Sun, 08 Jul 2007 12:21:09 +0200
parents cfb04f784a84
children 01ae56759d15
comparison
equal deleted inserted replaced
3000:bbca1e0e054a 3001:6d4b7b739232
54 #include "playlist.h" 54 #include "playlist.h"
55 #include "pluginenum.h" 55 #include "pluginenum.h"
56 #include "ui_main.h" 56 #include "ui_main.h"
57 #include "ui_playlist.h" 57 #include "ui_playlist.h"
58 #include "ui_skinned_textbox.h" 58 #include "ui_skinned_textbox.h"
59 #include "ui_skinned_number.h"
59 #include "util.h" 60 #include "util.h"
60 #include "visualization.h" 61 #include "visualization.h"
61 #include "vfs.h" 62 #include "vfs.h"
62 63
63 gboolean ev_waiting = FALSE; 64 gboolean ev_waiting = FALSE;
80 81
81 timeleft = cfg.pause_between_songs_time - 82 timeleft = cfg.pause_between_songs_time -
82 (gint) g_timer_elapsed(pause_timer, NULL); 83 (gint) g_timer_elapsed(pause_timer, NULL);
83 84
84 if (mainwin_10min_num != NULL) { 85 if (mainwin_10min_num != NULL) {
85 number_set_number(mainwin_10min_num, timeleft / 600); 86 ui_skinned_number_set_number(mainwin_10min_num, timeleft / 600);
86 number_set_number(mainwin_min_num, (timeleft / 60) % 10); 87 ui_skinned_number_set_number(mainwin_min_num, (timeleft / 60) % 10);
87 number_set_number(mainwin_10sec_num, (timeleft / 10) % 6); 88 ui_skinned_number_set_number(mainwin_10sec_num, (timeleft / 10) % 6);
88 number_set_number(mainwin_sec_num, timeleft % 10); 89 ui_skinned_number_set_number(mainwin_sec_num, timeleft % 10);
89 } 90 }
90 91
91 if (mainwin_sposition != NULL && !mainwin_sposition->hs_pressed) { 92 if (mainwin_sposition != NULL && !mainwin_sposition->hs_pressed) {
92 gchar *time_str; 93 gchar *time_str;
93 94
94 time_str = g_strdup_printf("%2.2d", timeleft / 60); 95 time_str = g_strdup_printf("%2.2d", timeleft / 60);
95 ui_skinned_textbox_set_text(mainwin_stime_min, time_str); 96 ui_skinned_textbox_set_text(mainwin_stime_min, time_str);
97 g_free(time_str);
96 98
97 time_str = g_strdup_printf("%2.2d", timeleft % 60); 99 time_str = g_strdup_printf("%2.2d", timeleft % 60);
98 ui_skinned_textbox_set_text(mainwin_stime_sec, time_str); 100 ui_skinned_textbox_set_text(mainwin_stime_sec, time_str);
101 g_free(time_str);
99 } 102 }
100 103
101 playlistwin_set_time(timeleft * 1000, 0, TIMER_ELAPSED); 104 playlistwin_set_time(timeleft * 1000, 0, TIMER_ELAPSED);
102 } 105 }
103 106