[Spice-devel] [client v2 07/10] audio: Remove spice_audio_new() from the public header

Francois Gouget fgouget at codeweavers.com
Wed Oct 19 16:07:14 UTC 2016


It has been deprecated for long enough.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
 src/spice-audio-priv.h | 2 ++
 src/spice-audio.h      | 5 -----
 src/spice-session.c    | 2 +-
 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;
-- 
2.9.3



More information about the Spice-devel mailing list