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

Don't use ofono_ prefix for static functions

This commit is contained in:
Denis Kenzior 2009-09-28 18:25:39 -05:00
parent 6a271dd258
commit 158f9ac1d5
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/call-volume.c
View File

@ -123,8 +123,6 @@ static void generic_callback(const struct ofono_error *error, void *data)
DBusConnection *conn = ofono_dbus_get_connection(); DBusConnection *conn = ofono_dbus_get_connection();
DBusMessage *reply; DBusMessage *reply;
cv->flags &= ~CALL_VOLUME_FLAG_PENDING;
if (!cv->pending) if (!cv->pending)
return; return;
@ -147,7 +145,7 @@ static void sv_set_callback(const struct ofono_error *error, void *data)
ofono_error("Error occurred during Speaker Volume set: %s", ofono_error("Error occurred during Speaker Volume set: %s",
telephony_error_to_str(error)); telephony_error_to_str(error));
} else { } else {
cv->speaker_volume = cv->temp_volume; cv->speaker_volume = cv->pending_volume;
} }
generic_callback(error, data); generic_callback(error, data);
@ -161,24 +159,23 @@ static void mv_set_callback(const struct ofono_error *error, void *data)
ofono_error("Error occurred during Microphone Volume set: %s", ofono_error("Error occurred during Microphone Volume set: %s",
telephony_error_to_str(error)); telephony_error_to_str(error));
} else { } else {
cv->microphone_volume = cv->temp_volume; cv->microphone_volume = cv->pending_volume;
} }
generic_callback(error, data); generic_callback(error, data);
} }
static DBusMessage *ofono_set_call_volume(DBusMessage *msg, static DBusMessage *cv_set_call_volume(DBusMessage *msg,
struct ofono_call_volume *cv, struct ofono_call_volume *cv,
const char *property, const char *property,
unsigned char percent) unsigned char percent)
{ {
if (percent > 100) if (percent > 100)
return __ofono_error_invalid_format(msg); return __ofono_error_invalid_format(msg);
DBG("set %s volume to %d percent", property, percent); DBG("set %s volume to %d percent", property, percent);
cv->flags |= CALL_VOLUME_FLAG_PENDING; cv->pending_volume = percent;
cv->temp_volume = percent;
if (msg) if (msg)
cv->pending = dbus_message_ref(msg); cv->pending = dbus_message_ref(msg);
@ -237,7 +234,7 @@ static DBusMessage *cv_set_property(DBusConnection *conn, DBusMessage *msg,
dbus_message_iter_get_basic(&var, &percent); dbus_message_iter_get_basic(&var, &percent);
return ofono_set_call_volume(msg, cv, property, percent); return cv_set_call_volume(msg, cv, property, percent);
} }
static GDBusMethodTable cv_methods[] = { static GDBusMethodTable cv_methods[] = {