[Spice-devel] [PATCH spice-gtk 1/4] Revert "audio: Remove spice_audio_new() from the public header"

[marcandre.lureau at redhat.com]

From: Marc-André Lureau <marcandre.lureau at redhat.com>

This reverts commit c6d9fa1c4af03d9875bf503ce6eabc9e7b52acc3.

There is no rush to remove a deprecated API from public headers. It's
better to do that when the whole library breaks API/ABI altogether.

Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
---
 src/spice-audio-priv.h | 2 --
 src/spice-audio.h      | 5 +++++
 src/spice-session.c    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/spice-audio-priv.h b/src/spice-audio-priv.h
index 8eee89b..f108059 100644
--- a/src/spice-audio-priv.h
+++ b/src/spice-audio-priv.h
@@ -29,8 +29,6 @@ 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 b3d739b..01f564a 100644
--- a/src/spice-audio.h
+++ b/src/spice-audio.h
@@ -103,6 +103,11 @@ 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 cc3dbdd..3f450d9 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-priv.h"
+#include "spice-audio.h"
 
 struct channel {
     SpiceChannel      *channel;
-- 
2.11.0.295.gd7dffce1c.dirty