diff options
| author | Luis de Bethencourt <luis@debethencourt.com> | 2011-05-25 00:57:27 +0200 |
|---|---|---|
| committer | Luis de Bethencourt <luis@debethencourt.com> | 2011-05-25 00:57:27 +0200 |
| commit | d3fe64ed56cc67c9ba32b2b7f8b3f54e6156eccf (patch) | |
| tree | d95f6e080ebbd2eeff8d1ec7e397ecb5eb2736ed | |
| parent | 5e757c64a73fa7371065061249a4bfc4125f8138 (diff) | |
ui: clean function names
| -rw-r--r-- | src/gst_engine.c | 2 | ||||
| -rw-r--r-- | src/snappy.c | 3 | ||||
| -rw-r--r-- | src/user_interface.c | 6 | ||||
| -rw-r--r-- | src/user_interface.h | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/gst_engine.c b/src/gst_engine.c index 3a8c40d..6e0fe67 100644 --- a/src/gst_engine.c +++ b/src/gst_engine.c @@ -339,7 +339,7 @@ bus_call (GstBus * bus, GstMessage * msg, gpointer data) add_uri_to_history (engine->uri); - update_controls (ui); + interface_update_controls (ui); engine->has_started = TRUE; } } diff --git a/src/snappy.c b/src/snappy.c index 51d185d..8169e5f 100644 --- a/src/snappy.c +++ b/src/snappy.c @@ -191,8 +191,7 @@ main (int argc, char *argv[]) } engine_load_uri (engine, uri); - interface_load_uri (ui, uri); - load_user_interface (ui); + interface_load (ui, uri); change_state (engine, "Paused"); change_state (engine, "Playing"); diff --git a/src/user_interface.c b/src/user_interface.c index 1e912e3..861e1c6 100644 --- a/src/user_interface.c +++ b/src/user_interface.c @@ -844,6 +844,7 @@ gboolean interface_load_uri (UserInterface * ui, gchar * uri) { ui->fileuri = uri; + ui->filename = g_path_get_basename (ui->fileuri); if (ui->stage != NULL) { @@ -853,13 +854,14 @@ interface_load_uri (UserInterface * ui, gchar * uri) } void -load_user_interface (UserInterface * ui) +interface_load (UserInterface * ui, gchar * uri) { ClutterColor stage_color = { 0x00, 0x00, 0x00, 0x00 }; g_print ("Loading ui!\n"); // Init UserInterface structure variables + ui->fileuri = uri; ui->filename = g_path_get_basename (ui->fileuri); ui->media_width = ui->engine->media_width; @@ -929,7 +931,7 @@ load_user_interface (UserInterface * ui) } gboolean -update_controls (UserInterface * ui) +interface_update_controls (UserInterface * ui) { progress_update_text (ui); progress_update_seekbar (ui); diff --git a/src/user_interface.h b/src/user_interface.h index 1d24619..83d7abd 100644 --- a/src/user_interface.h +++ b/src/user_interface.h @@ -106,8 +106,8 @@ struct _UserInterface // Declaration of non-static functions gboolean interface_load_uri (UserInterface * ui, gchar * uri); -void load_user_interface (UserInterface * ui); -gboolean update_controls (UserInterface * ui); +void interface_load (UserInterface * ui, gchar * uri); +gboolean interface_update_controls (UserInterface * ui); G_END_DECLS #endif /* __USER_INTERFACE_H__ */ |