removed autoload and osso

	ändrad:        CMakeLists.txt
	borttagen:     navit/autoload/osso/CMakeLists.txt
	borttagen:     navit/autoload/osso/osso.c
	ändrad:        navit/navit_shipped.xml

4 files changed, 0 insertions, 91 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3765003e3..947ee1410 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,7 +123,6 @@ add_module(speech/qt5_espeak "Qt5 multimedia not found" FALSE)
 add_module(vehicle/gpsd_dbus "dbus-glib-1 not found" FALSE)
 add_module(vehicle/qt5 "Qt5 libraries not found" FALSE)
 add_module(speech/speech_dispatcher "speech_dispatcher lib not found" FALSE)
-add_module(autoload/osso "Default" FALSE)
 add_module(map/garmin "Garmin library not found" FALSE)
 add_feature(USE_NATIVE_LANGUAGE_SUPPORT "Gettext not found and not on Windows" FALSE)
 set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_SOURCE_DIR}/cpack.cmake")
@@ -197,7 +196,6 @@ if(PKG_CONFIG_FOUND)
 	endif()
 
 	pkg_check_modules(LIBLOCATION liblocation)
-	pkg_check_modules(LIBOSSO libosso)
 	# Accept even old versions of libgps, because N810 uses an old version (see #1179).
 	pkg_check_modules(LIBGPS libgps)
 	pkg_check_modules(LIBGPS19 libgps>=2.90)
diff --git a/navit/autoload/osso/CMakeLists.txt b/navit/autoload/osso/CMakeLists.txt
deleted file mode 100644
index 2a6f9b631..000000000
--- a/navit/autoload/osso/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module_add_library(autoload_osso osso.c)
-
diff --git a/navit/autoload/osso/osso.c b/navit/autoload/osso/osso.c
deleted file mode 100644
index b94657569..000000000
--- a/navit/autoload/osso/osso.c
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <libosso.h>
-#include <stdlib.h>
-#include "config.h"
-#include "debug.h"
-#include "item.h"
-#include "attr.h"
-#include "navit.h"
-#include "plugin.h"
-#include "callback.h"
-#include "config_.h"
-
-static osso_context_t *osso_context;
-static struct attr callback = { attr_callback };
-
-struct cb_hw_state_trail {
-    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 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);
-    }
-
-    g_free(params->state);
-    g_free(params);
-
-    return FALSE;
-}
-
-/**
- * * 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_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));
-    }
-}
-
-void plugin_init(void) {
-    //struct callback *cb;
-
-    dbg(lvl_info, "enter");
-
-    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);
-}
diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index 5c2c404dc..12257b37c 100644
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -9,7 +9,6 @@
 <config xmlns:xi="http://www.w3.org/2001/XInclude">
 	<plugins>
 		<plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so" ondemand="yes"/>
-		<plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/>
 		<plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so" active="no"/>
 		<plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no"/>
 	</plugins>