From 04a64ca0155822622125cca05c65f84d1dc8a4aa Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Fri, 23 Dec 2011 16:03:10 -0500 Subject: [PATCH] libsaria: Use a load_file() function All this function does is load a file. Nothing else. I think this will be useful for using about-to-finish. --- include/libsaria/audio.h | 1 + libsaria/audio/controls.cpp | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/libsaria/audio.h b/include/libsaria/audio.h index 1a5e37e5..3c5b9ed1 100644 --- a/include/libsaria/audio.h +++ b/include/libsaria/audio.h @@ -16,6 +16,7 @@ namespace libsaria string get_current_file(); /* Playback control functions */ + void load_file(string); void load(string); void play(); void pause(); diff --git a/libsaria/audio/controls.cpp b/libsaria/audio/controls.cpp index d3d7c946..65a892f3 100644 --- a/libsaria/audio/controls.cpp +++ b/libsaria/audio/controls.cpp @@ -54,18 +54,25 @@ namespace libsaria seek_to(0); } - void audio::load(string file) + void audio::load_file(string file) { if (file == "") return; string uri = "file://" + file; - reset(); println("Loading uri: " + uri); - cur_file = file; g_object_set(G_OBJECT(player), "uri", uri.c_str(), NULL); + cur_file = file; trigger_callback(TRACK_LOADED); } + void audio::load(string file) + { + if (file == "") + return; + reset(); + load_file(file); + } + string audio::get_current_file() { return cur_file;