Merge branch 'trunk' into audioaudio

1 files changed, 50 insertions, 64 deletions

diff --git a/navit/autoload/osso/osso.c b/navit/autoload/osso/osso.c
index f6672090c..b94657569 100644
--- a/navit/autoload/osso/osso.c
+++ b/navit/autoload/osso/osso.c
@@ -12,89 +12,75 @@
 static osso_context_t *osso_context;
 static struct attr callback = { attr_callback };
 
-extern char *version;
-
 struct cb_hw_state_trail {
-	struct navit* nav;
-	osso_hw_state_t *state;
+    struct navit* nav;
+    osso_hw_state_t *state;
 };
 
-static void
-osso_display_on(struct navit *this_)
-{
-	osso_return_t err;
-	err = osso_display_blanking_pause(osso_context);
-	dbg(lvl_warning, "Unblank result: ",
-	    err == OSSO_OK ? "Ok" : (err ==
-				     OSSO_ERROR ? "Error" :
-				     "Invalid context"));
+static void osso_display_on(struct navit *this_) {
+    osso_return_t err;
+    err = osso_display_blanking_pause(osso_context);
+    dbg(lvl_warning, "Unblank result: ",
+        err == OSSO_OK ? "Ok" : (err ==
+                                 OSSO_ERROR ? "Error" :
+                                 "Invalid context"));
 }
 
-static gboolean
-osso_cb_hw_state_idle(struct cb_hw_state_trail * params)
-{
-	dbg(lvl_debug, "(inact=%d, save=%d, shut=%d, memlow=%d, state=%d)\n",
-	    params->state->system_inactivity_ind,
-	    params->state->save_unsaved_data_ind, params->state->shutdown_ind,
-	    params->state->memory_low_ind, params->state->sig_device_mode_ind);
+static gboolean osso_cb_hw_state_idle(struct cb_hw_state_trail * params) {
+    dbg(lvl_debug, "(inact=%d, save=%d, shut=%d, memlow=%d, state=%d)",
+        params->state->system_inactivity_ind,
+        params->state->save_unsaved_data_ind, params->state->shutdown_ind,
+        params->state->memory_low_ind, params->state->sig_device_mode_ind);
 
-	if (params->state->shutdown_ind) {
-		/* we  are going  down, down,  down */
-		navit_destroy(params->nav);		
-	}
+    if (params->state->shutdown_ind) {
+        /* we  are going  down, down,  down */
+        navit_destroy(params->nav);
+    }
 
-	g_free(params->state);
-	g_free(params);
+    g_free(params->state);
+    g_free(params);
 
-	return FALSE;
+    return FALSE;
 }
 
 /**
- * * Handle osso events  
- * * @param state Osso hardware state  
- * * @param  data ptr to private data  
- * * @returns nothing  
+ * * Handle osso events
+ * * @param state Osso hardware state
+ * * @param  data ptr to private data
+ * * @returns nothing
  **/
-static void
-osso_cb_hw_state(osso_hw_state_t * state, gpointer data)
-{
-	struct navit *nav = (struct navit*)data;
-	struct cb_hw_state_trail *params = g_new(struct cb_hw_state_trail,1);
-	params->nav=nav;
-	params->state = g_new(osso_hw_state_t, 1);
-	memcpy(params->state, state, sizeof(osso_hw_state_t));
-	g_idle_add((GSourceFunc) osso_cb_hw_state_idle, params);
+static void osso_cb_hw_state(osso_hw_state_t * state, gpointer data) {
+    struct navit *nav = (struct navit*)data;
+    struct cb_hw_state_trail *params = g_new(struct cb_hw_state_trail,1);
+    params->nav=nav;
+    params->state = g_new(osso_hw_state_t, 1);
+    memcpy(params->state, state, sizeof(osso_hw_state_t));
+    g_idle_add((GSourceFunc) osso_cb_hw_state_idle, params);
 }
 
-static void
-osso_navit(struct navit *nav, int add)
-{
-	dbg(lvl_debug, "Installing osso context for org.navit_project.navit\n");
-	osso_context = osso_initialize("org.navit_project.navit", version, TRUE, NULL);
-	if (osso_context == NULL) {
-		dbg(lvl_error, "error initiating osso context\n");
-	}
-	osso_hw_set_event_cb(osso_context, NULL, osso_cb_hw_state, nav);
+static void osso_navit(struct navit *nav, int add) {
+    dbg(lvl_debug, "Installing osso context for org.navit_project.navit");
+    osso_context = osso_initialize("org.navit_project.navit", NAVIT_VERSION, TRUE, NULL);
+    if (osso_context == NULL) {
+        dbg(lvl_error, "error initiating osso context");
+    }
+    osso_hw_set_event_cb(osso_context, NULL, osso_cb_hw_state, nav);
 
-	if (add > 0) {
-		/* add callback to unblank screen */
-		navit_add_callback(nav, callback_new_attr_0(callback_cast (osso_display_on), attr_unsuspend));
-	}
+    if (add > 0) {
+        /* add callback to unblank screen */
+        navit_add_callback(nav, callback_new_attr_0(callback_cast (osso_display_on), attr_unsuspend));
+    }
 }
 
-void
-plugin_init(void)
-{
-	//struct callback *cb;
+void plugin_init(void) {
+    //struct callback *cb;
 
-	dbg(lvl_info, "enter\n");
+    dbg(lvl_info, "enter");
 
-	callback.u.callback = callback_new_attr_0(callback_cast(osso_navit), attr_navit);
-	config_add_attr(config, &callback);
+    callback.u.callback = callback_new_attr_0(callback_cast(osso_navit), attr_navit);
+    config_add_attr(config, &callback);
 }
 
-void
-plugin_deinit(void)
-{
-	osso_deinitialize(osso_context);
+void plugin_deinit(void) {
+    osso_deinitialize(osso_context);
 }