[Spice-devel,client,v3,05/10] audio: Remove spice_audio_new() from the public header

Submitted by Francois Gouget on Oct. 27, 2016, 4:41 p.m.

Details

Message ID a9d9289bca25430bc3d1adc828a19f2ee9d6f7a7.1477585592.git.fgouget@free.fr
State New
Headers show
Series "Deprecation warning cleanup" ( rev: 6 5 ) in Spice

Not browsing as part of any series.

Commit Message

Francois Gouget Oct. 27, 2016, 4:41 p.m.
It has been deprecated for long enough.

Signed-off-by: Francois Gouget <fgouget@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(-)

Patch hide | download patch | download mbox

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;

Comments

Seems OK to me. Looks like it was deprecated in Feb 2012.  Anybody else
have objections? 


On Thu, 2016-10-27 at 18:41 +0200, Francois Gouget wrote:
> It has been deprecated for long enough.
> 
> Signed-off-by: Francois Gouget <fgouget@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;
Hi,

On Thu, Oct 27, 2016 at 04:07:15PM -0500, Jonathon Jongsma wrote:
> Seems OK to me. Looks like it was deprecated in Feb 2012.  Anybody else
> have objections? 

None. I also think it is safe to remove it now.
Pushed all the acked patches.

Cheers,
  toso

>
>
> On Thu, 2016-10-27 at 18:41 +0200, Francois Gouget wrote:
> > It has been deprecated for long enough.
> > 
> > Signed-off-by: Francois Gouget <fgouget@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;
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
On Mon, 2016-10-31 at 17:15 +0100, Victor Toso wrote:
> Hi,
> 
> On Thu, Oct 27, 2016 at 04:07:15PM -0500, Jonathon Jongsma wrote:
> > Seems OK to me. Looks like it was deprecated in Feb 2012.  Anybody
> > else
> > have objections? 
> 
> None. I also think it is safe to remove it now.
> Pushed all the acked patches.
> 

there should be a follow up to keep spice_audio_new in the map-file
and spice-glib-sym-file on `make -C src update-symbol-files`


> Cheers,
>   toso
> 
> > 
> > 
> > On Thu, 2016-10-27 at 18:41 +0200, Francois Gouget wrote:
> > > It has been deprecated for long enough.
> > > 
> > > Signed-off-by: Francois Gouget <fgouget@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;
> > 
> > _______________________________________________
> > Spice-devel mailing list
> > Spice-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/spice-devel
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
Hi

On Tue, Nov 1, 2016 at 1:20 PM Pavel Grunt <pgrunt@redhat.com> wrote:

> On Mon, 2016-10-31 at 17:15 +0100, Victor Toso wrote:
> > Hi,
> >
> > On Thu, Oct 27, 2016 at 04:07:15PM -0500, Jonathon Jongsma wrote:
> > > Seems OK to me. Looks like it was deprecated in Feb 2012.  Anybody
> > > else
> > > have objections?
> >
> > None. I also think it is safe to remove it now.
> > Pushed all the acked patches.
> >
>
> there should be a follow up to keep spice_audio_new in the map-file
> and spice-glib-sym-file on `make -C src update-symbol-files`
>

That, and update of documentation..
Imho it's not very beneficial to remove it from public header (break API),
and keep the symbol. But if we remove it from exported symbols, we break
ABI.

I would rather keep it for now, until we bump spice-gtk for API/ABI break.
No rush to do that either.

I'll send a revert patch.