comparison src/aosd/aosd_trigger.c @ 2057:cf4fa45ffd80

playlist API vtabling
author William Pitcock <nenolod@atheme.org>
date Sat, 13 Oct 2007 23:09:40 -0500
parents 2ffc6a69fcd1
children fffa7e3d39e0
comparison
equal deleted inserted replaced
2056:1428a79d6706 2057:cf4fa45ffd80
188 title = g_strdup(pl_entry->title); 188 title = g_strdup(pl_entry->title);
189 } 189 }
190 else 190 else
191 { 191 {
192 /* pick what we have as song title */ 192 /* pick what we have as song title */
193 Playlist *active = playlist_get_active(); 193 Playlist *active = aud_playlist_get_active();
194 gint pos = playlist_get_position(active); 194 gint pos = aud_playlist_get_position(active);
195 title = playlist_get_songtitle(active, pos); 195 title = aud_playlist_get_songtitle(active, pos);
196 } 196 }
197 utf8_title = aosd_trigger_utf8convert( title ); 197 utf8_title = aosd_trigger_utf8convert( title );
198 if ( g_utf8_validate( utf8_title , -1 , NULL ) == TRUE ) 198 if ( g_utf8_validate( utf8_title , -1 , NULL ) == TRUE )
199 { 199 {
200 gchar *utf8_title_markup = g_markup_printf_escaped( 200 gchar *utf8_title_markup = g_markup_printf_escaped(
386 } 386 }
387 387
388 static void 388 static void
389 aosd_trigger_func_pb_pauseoff_cb ( gpointer unused1 , gpointer unused2 ) 389 aosd_trigger_func_pb_pauseoff_cb ( gpointer unused1 , gpointer unused2 )
390 { 390 {
391 Playlist *active = playlist_get_active(); 391 Playlist *active = aud_playlist_get_active();
392 gint pos = playlist_get_position(active); 392 gint pos = aud_playlist_get_position(active);
393 gchar *title, *utf8_title, *utf8_title_markup; 393 gchar *title, *utf8_title, *utf8_title_markup;
394 gint time_cur, time_tot; 394 gint time_cur, time_tot;
395 gint time_cur_m, time_cur_s, time_tot_m, time_tot_s; 395 gint time_cur_m, time_cur_s, time_tot_m, time_tot_s;
396 396
397 time_tot = playlist_get_songtime(active, pos) / 1000; 397 time_tot = aud_playlist_get_songtime(active, pos) / 1000;
398 time_cur = audacious_drct_get_time() / 1000; 398 time_cur = audacious_drct_get_time() / 1000;
399 time_cur_s = time_cur % 60; 399 time_cur_s = time_cur % 60;
400 time_cur_m = (time_cur - time_cur_s) / 60; 400 time_cur_m = (time_cur - time_cur_s) / 60;
401 time_tot_s = time_tot % 60; 401 time_tot_s = time_tot % 60;
402 time_tot_m = (time_tot - time_tot_s) / 60; 402 time_tot_m = (time_tot - time_tot_s) / 60;
403 403
404 title = playlist_get_songtitle(active, pos); 404 title = aud_playlist_get_songtitle(active, pos);
405 utf8_title = aosd_trigger_utf8convert( title ); 405 utf8_title = aosd_trigger_utf8convert( title );
406 utf8_title_markup = g_markup_printf_escaped( 406 utf8_title_markup = g_markup_printf_escaped(
407 "<span font_desc='%s'>%s (%i:%02i/%i:%02i)</span>" , 407 "<span font_desc='%s'>%s (%i:%02i/%i:%02i)</span>" ,
408 global_config->osd->text.fonts_name[0] , utf8_title , time_cur_m , time_cur_s , time_tot_m , time_tot_s ); 408 global_config->osd->text.fonts_name[0] , utf8_title , time_cur_m , time_cur_s , time_tot_m , time_tot_s );
409 aosd_osd_display( utf8_title_markup , global_config->osd , FALSE ); 409 aosd_osd_display( utf8_title_markup , global_config->osd , FALSE );