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

Refactor: Break up call volume notify

This commit is contained in:
Denis Kenzior 2009-09-28 18:23:21 -05:00
parent d76f674794
commit 6a271dd258
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/call-volume.h
View File

@ -47,8 +47,10 @@ struct ofono_call_volume_driver {
ofono_call_volume_cb_t cb, void *data);
};
void ofono_call_volume_notify(struct ofono_call_volume *cv,
const char *property, unsigned char percent);
void ofono_call_volume_set_speaker_volume(struct ofono_call_volume *cv,
unsigned char percent);
void ofono_call_volume_set_microphone_volume(struct ofono_call_volume *cv,
unsigned char percent);
int ofono_call_volume_driver_register(const struct ofono_call_volume_driver *d);
void ofono_call_volume_driver_unregister(

42
src/call-volume.c
View File

@ -48,34 +48,44 @@ static GSList *g_drivers = NULL;
struct ofono_call_volume {
DBusMessage *pending;
const struct ofono_call_volume_driver *driver;
int flags;
void *driver_data;
struct ofono_atom *atom;
unsigned char speaker_volume;
unsigned char microphone_volume;
/* temp volume before it is accepted by remote */
unsigned char temp_volume;
unsigned char pending_volume;
const struct ofono_call_volume_driver *driver;
void *driver_data;
struct ofono_atom *atom;
};
void ofono_call_volume_notify(struct ofono_call_volume *cv,
const char *property,
void ofono_call_volume_set_speaker_volume(struct ofono_call_volume *cv,
unsigned char percent)
{
DBusConnection *conn = ofono_dbus_get_connection();
const char *path = __ofono_atom_get_path(cv->atom);
if (!strcmp(property, "SpeakerVolume"))
cv->speaker_volume = percent;
cv->speaker_volume = percent;
if (!strcmp(property, "MicrophoneVolume"))
cv->microphone_volume = percent;
if (__ofono_atom_get_registered(cv->atom) == FALSE)
return;
ofono_dbus_signal_property_changed(conn, path, CALL_VOLUME_INTERFACE,
property, DBUS_TYPE_BYTE,
&percent);
"SpeakerVolume",
DBUS_TYPE_BYTE, &percent);
}
void ofono_call_volume_set_microphone_volume(struct ofono_call_volume *cv,
unsigned char percent)
{
DBusConnection *conn = ofono_dbus_get_connection();
const char *path = __ofono_atom_get_path(cv->atom);
cv->microphone_volume = percent;
if (__ofono_atom_get_registered(cv->atom) == FALSE)
return;
ofono_dbus_signal_property_changed(conn, path, CALL_VOLUME_INTERFACE,
"MicrophoneVolume",
DBUS_TYPE_BYTE, &percent);
}
static DBusMessage *cv_get_properties(DBusConnection *conn,