sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Move call volume interface definition to dbus.h

This commit is contained in:
Denis Kenzior 2010-03-22 15:33:56 -05:00
parent bbfd7db3cc
commit 500f291030
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/dbus.h
View File

@ -35,11 +35,12 @@ extern "C" {
#define OFONO_CALL_BARRING_INTERFACE "org.ofono.CallBarring"
#define OFONO_CALL_FORWARDING_INTERFACE "org.ofono.CallForwarding"
#define OFONO_CALL_METER_INTERFACE "org.ofono.CallMeter"
#define OFONO_CALL_SETTINGS_INTERFACE "org.ofono.CallSettings"
#define OFONO_CALL_VOLUME_INTERFACE OFONO_SERVICE ".CallVolume"
#define OFONO_MESSAGE_WAITING_INTERFACE "org.ofono.MessageWaiting"
#define OFONO_PHONEBOOK_INTERFACE "org.ofono.Phonebook"
#define OFONO_RADIO_SETTINGS_INTERFACE "org.ofono.RadioSettings"
#define OFONO_SMS_MANAGER_INTERFACE "org.ofono.SmsManager"
#define OFONO_CALL_SETTINGS_INTERFACE "org.ofono.CallSettings"
#define OFONO_VOICECALL_INTERFACE "org.ofono.VoiceCall"
#define OFONO_VOICECALL_MANAGER_INTERFACE "org.ofono.VoiceCallManager"

30
src/call-volume.c
View File

@ -40,8 +40,6 @@
#include "ofono.h"
#include "common.h"
#define CALL_VOLUME_INTERFACE OFONO_SERVICE ".CallVolume"
static GSList *g_drivers = NULL;
struct ofono_call_volume {
@ -67,7 +65,8 @@ void ofono_call_volume_set_speaker_volume(struct ofono_call_volume *cv,
if (__ofono_atom_get_registered(cv->atom) == FALSE)
return;
ofono_dbus_signal_property_changed(conn, path, CALL_VOLUME_INTERFACE,
ofono_dbus_signal_property_changed(conn, path,
OFONO_CALL_VOLUME_INTERFACE,
"SpeakerVolume",
DBUS_TYPE_BYTE, &percent);
}
@ -83,7 +82,8 @@ void ofono_call_volume_set_microphone_volume(struct ofono_call_volume *cv,
if (__ofono_atom_get_registered(cv->atom) == FALSE)
return;
ofono_dbus_signal_property_changed(conn, path, CALL_VOLUME_INTERFACE,
ofono_dbus_signal_property_changed(conn, path,
OFONO_CALL_VOLUME_INTERFACE,
"MicrophoneVolume",
DBUS_TYPE_BYTE, &percent);
}
@ -100,7 +100,8 @@ void ofono_call_volume_set_muted(struct ofono_call_volume *cv, int muted)
return;
m = muted;
ofono_dbus_signal_property_changed(conn, path, CALL_VOLUME_INTERFACE,
ofono_dbus_signal_property_changed(conn, path,
OFONO_CALL_VOLUME_INTERFACE,
"Muted", DBUS_TYPE_BOOLEAN, &m);
}
@ -154,7 +155,8 @@ static void sv_set_callback(const struct ofono_error *error, void *data)
__ofono_dbus_pending_reply(&cv->pending,
dbus_message_new_method_return(cv->pending));
ofono_dbus_signal_property_changed(conn, path, CALL_VOLUME_INTERFACE,
ofono_dbus_signal_property_changed(conn, path,
OFONO_CALL_VOLUME_INTERFACE,
"SpeakerVolume",
DBUS_TYPE_BYTE, &cv->speaker_volume);
}
@ -176,7 +178,8 @@ static void mv_set_callback(const struct ofono_error *error, void *data)
__ofono_dbus_pending_reply(&cv->pending,
dbus_message_new_method_return(cv->pending));
ofono_dbus_signal_property_changed(conn, path, CALL_VOLUME_INTERFACE,
ofono_dbus_signal_property_changed(conn, path,
OFONO_CALL_VOLUME_INTERFACE,
"MicrophoneVolume",
DBUS_TYPE_BYTE, &cv->microphone_volume);
}
@ -201,7 +204,8 @@ static void muted_set_callback(const struct ofono_error *error, void *data)
__ofono_dbus_pending_reply(&cv->pending,
dbus_message_new_method_return(cv->pending));
ofono_dbus_signal_property_changed(conn, path, CALL_VOLUME_INTERFACE,
ofono_dbus_signal_property_changed(conn, path,
OFONO_CALL_VOLUME_INTERFACE,
"Muted", DBUS_TYPE_BOOLEAN, &m);
}
@ -366,9 +370,9 @@ static void call_volume_unregister(struct ofono_atom *atom)
struct ofono_modem *modem = __ofono_atom_get_modem(atom);
const char *path = __ofono_atom_get_path(atom);
ofono_modem_remove_interface(modem, CALL_VOLUME_INTERFACE);
ofono_modem_remove_interface(modem, OFONO_CALL_VOLUME_INTERFACE);
g_dbus_unregister_interface(conn, path,
CALL_VOLUME_INTERFACE);
OFONO_CALL_VOLUME_INTERFACE);
}
void ofono_call_volume_register(struct ofono_call_volume *cv)
@ -378,16 +382,16 @@ void ofono_call_volume_register(struct ofono_call_volume *cv)
const char *path = __ofono_atom_get_path(cv->atom);
if (!g_dbus_register_interface(conn, path,
CALL_VOLUME_INTERFACE,
OFONO_CALL_VOLUME_INTERFACE,
cv_methods, cv_signals, NULL,
cv, NULL)) {
ofono_error("Could not create %s interface",
CALL_VOLUME_INTERFACE);
OFONO_CALL_VOLUME_INTERFACE);
return;
}
ofono_modem_add_interface(modem, CALL_VOLUME_INTERFACE);
ofono_modem_add_interface(modem, OFONO_CALL_VOLUME_INTERFACE);
__ofono_atom_register(cv->atom, call_volume_unregister);
}