Rename RAOP callbacks for consistency

This commit is contained in:
Julien BLACHE 2011-03-11 18:32:47 +01:00
parent c2579dc0a6
commit 5bad343278

View File

@ -1730,7 +1730,7 @@ raop_set_volume_internal(struct raop_session *rs, int volume, evrtsp_req_cb cb)
}
static void
raop_set_volume_cb(struct evrtsp_request *req, void *arg)
raop_cb_set_volume(struct evrtsp_request *req, void *arg)
{
raop_status_cb status_cb;
struct raop_session *rs;
@ -1777,7 +1777,7 @@ raop_set_volume_one(struct raop_session *rs, int volume, raop_status_cb cb)
if (!(rs->state & RAOP_CONNECTED))
return 0;
ret = raop_set_volume_internal(rs, volume, raop_set_volume_cb);
ret = raop_set_volume_internal(rs, volume, raop_cb_set_volume);
if (ret < 0)
{
raop_session_failure(rs);
@ -1791,7 +1791,7 @@ raop_set_volume_one(struct raop_session *rs, int volume, raop_status_cb cb)
}
static void
raop_flush_cb(struct evrtsp_request *req, void *arg)
raop_cb_flush(struct evrtsp_request *req, void *arg)
{
raop_status_cb status_cb;
struct raop_session *rs;
@ -1861,7 +1861,7 @@ raop_flush(raop_status_cb cb, uint64_t rtptime)
if (rs->state != RAOP_STREAMING)
continue;
ret = raop_send_req_flush(rs, rtptime, raop_flush_cb);
ret = raop_send_req_flush(rs, rtptime, raop_cb_flush);
if (ret < 0)
{
raop_session_failure(rs);