anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

gui/audio: Convert o_progress widget to use seconds 

This feels better than using units of nanoseconds.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-12-25 17:57:58 -05:00
parent 5e96f40cf8
commit 627619c391
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/audio.c
View File

@ -73,15 +73,15 @@ void __audio_pause_enabled(GtkToggleButton *enabled, GtkSpinButton *count)
void __audio_seek(GtkRange *range, GtkScrollType type, double value, gpointer data)
{
audio_seek(value);
audio_seek(value * GST_SECOND);
}
static int __audio_timeout(gpointer data)
{
GtkAdjustment *progress = data;
gtk_adjustment_set_upper(progress, audio_duration() - GST_SECOND);
gtk_adjustment_set_value(progress, audio_position());
gtk_adjustment_set_upper(progress, audio_duration() / GST_SECOND);
gtk_adjustment_set_value(progress, audio_position() / GST_SECOND);
__audio_set_time_label("o_position", audio_position() / GST_SECOND);
return G_SOURCE_CONTINUE;

9
tests/gui/audio.c
View File

@ -101,6 +101,8 @@ static void test_audio()
test_click_button("o_next");
test_equal(audio_cur_track()->tr_track, 2);
test_equal(test_get_toggle_state("o_favorite"), (bool)false);
test_equal(test_get_toggle_state("o_hide"), (bool)false);
gtk_spin_button_set_value(
GTK_SPIN_BUTTON(gui_builder_widget("o_pause_count")), 1);
@ -123,6 +125,13 @@ static void test_audio()
test_audio_seek(71 * GST_SECOND);
test_gui_audio_timeout();
test_equal(test_get_label_text("o_position"), "1:11");
test_equal((guint)gtk_adjustment_get_upper(
GTK_ADJUSTMENT(gui_builder_object("o_progress"))),
audio_cur_track()->tr_length);
test_click_button("o_stop");
test_equal(audio_cur_state(), GST_STATE_PAUSED);
test_equal(audio_position(), 0);
gui_builder_deinit();
}