summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois Gouget <fgouget@codeweavers.com>2016-10-27 18:41:48 +0200
committerVictor Toso <me@victortoso.com>2016-10-31 17:13:30 +0100
commitc6d9fa1c4af03d9875bf503ce6eabc9e7b52acc3 (patch)
tree5977d14cbd205631330c3cb6e2dc2d97d75bcb02
parentee6f7e86e3e8da0c25c7b1fad6919fff39222d68 (diff)
audio: Remove spice_audio_new() from the public header
It has been deprecated for long enough. Signed-off-by: Francois Gouget <fgouget@codeweavers.com> Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
-rw-r--r--src/spice-audio-priv.h2
-rw-r--r--src/spice-audio.h5
-rw-r--r--src/spice-session.c2
3 files changed, 3 insertions, 6 deletions
diff --git a/src/spice-audio-priv.h b/src/spice-audio-priv.h
index f108059..8eee89b 100644
--- a/src/spice-audio-priv.h
+++ b/src/spice-audio-priv.h
@@ -29,6 +29,8 @@ struct _SpiceAudioPrivate {
GMainContext *main_context;
};
+SpiceAudio* spice_audio_new(SpiceSession *session, GMainContext *context, const char *name);
+
void spice_audio_get_playback_volume_info_async(SpiceAudio *audio, GCancellable *cancellable,
SpiceMainChannel *main_channel, GAsyncReadyCallback callback, gpointer user_data);
gboolean spice_audio_get_playback_volume_info_finish(SpiceAudio *audio, GAsyncResult *res,
diff --git a/src/spice-audio.h b/src/spice-audio.h
index 01f564a..b3d739b 100644
--- a/src/spice-audio.h
+++ b/src/spice-audio.h
@@ -103,11 +103,6 @@ GType spice_audio_get_type(void);
SpiceAudio* spice_audio_get(SpiceSession *session, GMainContext *context);
-#ifndef SPICE_DISABLE_DEPRECATED
-SPICE_DEPRECATED_FOR(spice_audio_get)
-SpiceAudio* spice_audio_new(SpiceSession *session, GMainContext *context, const char *name);
-#endif
-
G_END_DECLS
#endif /* __SPICE_CLIENT_AUDIO_H__ */
diff --git a/src/spice-session.c b/src/spice-session.c
index 238b5cb..f900bd1 100644
--- a/src/spice-session.c
+++ b/src/spice-session.c
@@ -33,7 +33,7 @@
#include "wocky-http-proxy.h"
#include "spice-uri-priv.h"
#include "channel-playback-priv.h"
-#include "spice-audio.h"
+#include "spice-audio-priv.h"
struct channel {
SpiceChannel *channel;