summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2014-07-04 23:28:20 (GMT)
committerPaul Kocialkowski <contact@paulk.fr>2014-08-07 11:22:37 (GMT)
commit9a0f83fca07658910b4e8a22749f1584602992f1 (patch)
tree8a406ccc3401ab2c6164232e20c3ad6a41322dfb
parent8f588313abf068f0eca3819651a63ce769324ab7 (diff)
downloaddevice_samsung_crespo-9a0f83fca07658910b4e8a22749f1584602992f1.zip
device_samsung_crespo-9a0f83fca07658910b4e8a22749f1584602992f1.tar.gz
device_samsung_crespo-9a0f83fca07658910b4e8a22749f1584602992f1.tar.bz2
Audio-RIL-Interface: Keep up with libsrs-clientHEADreplicant-4.2-0004replicant-4.2-0003replicant-4.2
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
-rw-r--r--audio-ril-interface/audio-ril-interface.c32
1 files changed, 17 insertions, 15 deletions
diff --git a/audio-ril-interface/audio-ril-interface.c b/audio-ril-interface/audio-ril-interface.c
index 1ab56fd..09cadd4 100644
--- a/audio-ril-interface/audio-ril-interface.c
+++ b/audio-ril-interface/audio-ril-interface.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Paul Kocialkowski <contact@paulk.fr>
+ * Copyright (C) 2013-2014 Paul Kocialkowski <contact@paulk.fr>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -31,9 +31,11 @@ HRilClient OpenClient_RILD(void)
ALOGD("%s()", __func__);
- signal(SIGPIPE, SIG_IGN);
-
- srs_client_create(&client);
+ client = srs_client_create();
+ if (client == NULL) {
+ ALOGE("%s: Failed to create SRS client", __func__);
+ return NULL;
+ }
return (void *) client;
}
@@ -56,11 +58,9 @@ int Connect_RILD(HRilClient data)
return RIL_CLIENT_ERR_CONNECT;
}
- rc = srs_client_ping(client);
- if (rc < 0) {
- ALOGE("%s: Failed to ping SRS client", __func__);
- return RIL_CLIENT_ERR_UNKNOWN;
- }
+ rc = srs_ping(client);
+ if (rc < 0)
+ ALOGE("%s: Failed to ping SRS", __func__);
return RIL_CLIENT_ERR_SUCCESS;
}
@@ -98,7 +98,9 @@ int CloseClient_RILD(HRilClient data)
client = (struct srs_client *) data;
- srs_client_destroy(client);
+ rc = srs_client_destroy(client);
+ if (rc < 0)
+ ALOGE("%s: Failed to destroy SRS client", __func__);
return RIL_CLIENT_ERR_SUCCESS;
}
@@ -115,9 +117,9 @@ int isConnected_RILD(HRilClient data)
client = (struct srs_client *) data;
- rc = srs_client_ping(client);
+ rc = srs_ping(client);
if (rc < 0) {
- ALOGE("%s: Failed to ping SRS client", __func__);
+ ALOGE("%s: Failed to ping SRS", __func__);
return 0;
}
@@ -127,7 +129,7 @@ int isConnected_RILD(HRilClient data)
int SetCallVolume(HRilClient data, SoundType type, int level)
{
struct srs_client *client;
- struct srs_snd_call_volume call_volume;
+ struct srs_snd_call_volume_data call_volume;
int rc;
ALOGD("%s(%p, %d, %d)", __func__, data, type, level);
@@ -151,7 +153,7 @@ int SetCallVolume(HRilClient data, SoundType type, int level)
int SetCallAudioPath(HRilClient data, AudioPath path)
{
struct srs_client *client;
- struct srs_snd_call_audio_path call_audio_path;
+ struct srs_snd_call_audio_path_data call_audio_path;
int rc;
ALOGD("%s(%p, %d)", __func__, data, path);
@@ -173,7 +175,7 @@ int SetCallAudioPath(HRilClient data, AudioPath path)
int SetCallClockSync(HRilClient data, SoundClockCondition condition)
{
struct srs_client *client;
- struct srs_snd_call_clock_sync call_clock_sync;
+ struct srs_snd_call_clock_sync_data call_clock_sync;
int rc;
ALOGD("%s(%p, %d)", __func__, data, condition);