[maemo-commits] [maemo-commits] r10647 - in projects/haf/trunk/libosso: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-03-20 15:35:54 +0200 (Tue, 20 Mar 2007)
New Revision: 10647

Modified:
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/debian/control
   projects/haf/trunk/libosso/src/libosso.h
   projects/haf/trunk/libosso/src/osso-hw.c
   projects/haf/trunk/libosso/src/osso-locale.c
   projects/haf/trunk/libosso/src/osso-locale.h
Log:
now using mce-dev for definitions


Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2007-03-20 12:31:34 UTC (rev 10646)
+++ projects/haf/trunk/libosso/debian/changelog	2007-03-20 13:35:54 UTC (rev 10647)
@@ -1,3 +1,11 @@
+libosso (2.3-1) unstable; urgency=low
+
+  * UNRELEASED
+  * New API (osso_hw_set_display_event_cb) for catching the MCE display
+    signal.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 20 Mar 2007 14:00:09 +0200
+
 libosso (2.2-1) unstable; urgency=low
 
   * New API from Gabriel for detecting language change.

Modified: projects/haf/trunk/libosso/debian/control
===================================================================
--- projects/haf/trunk/libosso/debian/control	2007-03-20 12:31:34 UTC (rev 10646)
+++ projects/haf/trunk/libosso/debian/control	2007-03-20 13:35:54 UTC (rev 10647)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), libdbus-glib-1-dev (>=0.61-osso18), libglib2.0-dev, doxygen
+Build-Depends: debhelper (>= 4.0.0), libdbus-glib-1-dev (>=0.61-osso18), libglib2.0-dev, doxygen, mce-dev (>= 1.5.21)
 Standards-Version: 3.6.0
 
 Package: libosso-dev

Modified: projects/haf/trunk/libosso/src/libosso.h
===================================================================
--- projects/haf/trunk/libosso/src/libosso.h	2007-03-20 12:31:34 UTC (rev 10646)
+++ projects/haf/trunk/libosso/src/libosso.h	2007-03-20 13:35:54 UTC (rev 10647)
@@ -1297,6 +1297,31 @@
 osso_return_t osso_hw_unset_event_cb(osso_context_t *osso,
 				     osso_hw_state_t *state);
 
+
+typedef enum {
+  OSSO_DISPLAY_ON,
+  OSSO_DISPLAY_OFF,
+  OSSO_DISPLAY_DIMMED
+} osso_display_state_t;
+
+typedef void(osso_display_event_cb_f)(osso_display_state_t state,
+                                      gpointer data);
+
+/**
+ * This function registers a callback that is called whenever the display
+ * state is changed. It is also called once directly after registering it,
+ * to tell about the current state.
+ * @param osso The library context as returned by #osso_initialize.
+ * @param cb Function that is called when the display state is changed.
+ * @param data Arbitrary application-specific pointer that will be passed
+ * to the callback and ignored by Libosso.
+ * @return #OSSO_OK if all goes well, #OSSO_ERROR if an error occurred, or
+ * #OSSO_INVALID if some parameter is invalid.
+ */
+osso_return_t osso_hw_set_display_event_cb(osso_context_t *osso,
+					   osso_display_event_cb_f *cb,
+					   gpointer data);
+
 /*@}*/
 /**********************************************************************/
 /**

Modified: projects/haf/trunk/libosso/src/osso-hw.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-hw.c	2007-03-20 12:31:34 UTC (rev 10646)
+++ projects/haf/trunk/libosso/src/osso-hw.c	2007-03-20 13:35:54 UTC (rev 10647)
@@ -27,28 +27,10 @@
 #include "osso-hw.h"
 #include "osso-mem.h"
 #include "muali.h"
+#include <mce/dbus-names.h>
+#include <mce/mode-names.h>
 #include <assert.h>
 
-#define MCE_SERVICE			"com.nokia.mce"
-#define MCE_REQUEST_PATH		"/com/nokia/mce/request"
-#define MCE_REQUEST_IF			"com.nokia.mce.request"
-#define MCE_SIGNAL_PATH			"/com/nokia/mce/signal"
-#define MCE_SIGNAL_IF			"com.nokia.mce.signal"
-#define MCE_SIGNAL_SVC		        MCE_SERVICE	
-#define MCE_DISPLAY_ON_REQ		"req_display_state_on"
-#define MCE_PREVENT_BLANK_REQ		"req_display_blanking_pause"
-
-#define DEVICE_MODE_SIG	                "sig_device_mode_ind"
-#define INACTIVITY_SIG                  "system_inactivity_ind"
-#define SHUTDOWN_SIG                    "shutdown_ind"
-#define SAVE_UNSAVED_SIG                "save_unsaved_data_ind"
-#define DISPLAY_STATUS_SIG              "display_status_ind"
-
-#define NORMAL_MODE                     "normal"
-#define FLIGHT_MODE                     "flight"
-#define OFFLINE_MODE                    "offline"
-#define INVALID_MODE                    "invalid"
-
 /* user lowmem signal */
 #define USER_LOWMEM_OFF_SIGNAL_SVC "com.nokia.ke_recv"
 #define USER_LOWMEM_OFF_SIGNAL_OP "/com/nokia/ke_recv/user_lowmem_off"

Modified: projects/haf/trunk/libosso/src/osso-locale.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-locale.c	2007-03-20 12:31:34 UTC (rev 10646)
+++ projects/haf/trunk/libosso/src/osso-locale.c	2007-03-20 13:35:54 UTC (rev 10647)
@@ -4,7 +4,7 @@
  * 
  * This file is part of libosso
  *
- * Copyright (C) 2005 Nokia Corporation. All rights reserved.
+ * Copyright (C) 2007 Nokia Corporation. All rights reserved.
  *
  * Contact: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
  *

Modified: projects/haf/trunk/libosso/src/osso-locale.h
===================================================================
--- projects/haf/trunk/libosso/src/osso-locale.h	2007-03-20 12:31:34 UTC (rev 10646)
+++ projects/haf/trunk/libosso/src/osso-locale.h	2007-03-20 13:35:54 UTC (rev 10647)
@@ -4,7 +4,7 @@
  * 
  * This file is part of libosso
  *
- * Copyright (C) 2005 Nokia Corporation. All rights reserved.
+ * Copyright (C) 2007 Nokia Corporation. All rights reserved.
  *
  * Contact: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
  *