Rename to Support

spa/include/spa/log.h

@@ -31,6 +31,7 @@ typedef struct _SpaLog SpaLog;
 #include <spa/defs.h>
 #include <spa/plugin.h>
 
+#define SPA_SUPPORT_ID_LOG                     3
 #define SPA_INTERFACE_ID_LOG                   3
 #define SPA_INTERFACE_ID_LOG_NAME              "Log interface"
 #define SPA_INTERFACE_ID_LOG_DESCRIPTION       "Log interface"

spa/include/spa/plugin.h

@@ -79,17 +79,17 @@ typedef struct {
 } SpaInterfaceInfo;
 
 /**
- * SpaInterface:
+ * SpaSupport:
- * @interface_id: the id of the interface
+ * @support_id: the id of the support item
- * @interface: an interface instance
+ * @data: specific data for the item
  *
- * An interface instance that is usually passed to the init() function of
+ * Extra supporting infrastructure passed to the init() function of
- * a factory to provide extra API such as logging.
+ * a factory. It can be extra information or interfaces such as logging.
  */
 typedef struct {
-  uint32_t  interface_id;
+  uint32_t  support_id;
-  void     *interface;
+  void     *data;
-} SpaInterface;
+} SpaSupport;
 
 struct _SpaHandleFactory {
   /**
@@ -117,14 +117,14 @@ struct _SpaHandleFactory {
    * @handle: a pointer to memory
    * @info: extra handle specific information, usually obtained
    *        from a #SpaMonitor. This can be used to configure the handle.
-   * @platform: platform interfaces
+   * @support: support items
-   * @n_platform: number of elements in @platform
+   * @n_support: number of elements in @support
    *
    * Initialize an instance of this factory. The caller should allocate
    * memory at least SpaHandleFactory::size bytes and pass this as @handle.
    *
-   * @platform can optionally contain extra interfaces that the plugin can
+   * @support can optionally contain extra interfaces or data ites that the
-   * use such as a logger.
+   * plugin can use such as a logger.
    *
    * Returns: #SPA_RESULT_OK on success
    *          #SPA_RESULT_NOT_IMPLEMENTED when an instance can't be made
@@ -133,8 +133,8 @@ struct _SpaHandleFactory {
   SpaResult   (*init)                 (const SpaHandleFactory  *factory,
                                        SpaHandle               *handle,
                                        const SpaDict           *info,
-                                       const SpaInterface     **platform,
+                                       const SpaSupport       **support,
-                                       unsigned int             n_platform);
+                                       unsigned int             n_support);
 
   /**
    * SpaHandle::enum_interface_info:

spa/plugins/alsa/alsa-monitor.c

@@ -380,8 +380,8 @@ static SpaResult
 alsa_monitor_init (const SpaHandleFactory  *factory,
                    SpaHandle               *handle,
                    const SpaDict           *info,
-                   const SpaInterface     **platform,
+                   const SpaSupport       **support,
-                   unsigned int             n_platform)
+                   unsigned int             n_support)
 {
   SpaALSAMonitor *this;
 

spa/plugins/alsa/alsa-sink.c

@@ -599,8 +599,8 @@ static SpaResult
 alsa_sink_init (const SpaHandleFactory  *factory,
                 SpaHandle               *handle,
                 const SpaDict           *info,
-                const SpaInterface     **platform,
+                const SpaSupport       **support,
-                unsigned int             n_platform)
+                unsigned int             n_support)
 {
   SpaALSASink *this;
 

spa/plugins/alsa/alsa-source.c

@@ -752,8 +752,8 @@ static SpaResult
 alsa_source_init (const SpaHandleFactory  *factory,
                   SpaHandle               *handle,
                   const SpaDict           *info,
-                  const SpaInterface     **platform,
+                  const SpaSupport       **support,
-                  unsigned int             n_platform)
+                  unsigned int             n_support)
 {
   SpaALSASource *this;
   unsigned int i;

spa/plugins/audiomixer/audiomixer.c

@@ -780,8 +780,8 @@ static SpaResult
 spa_audiomixer_init (const SpaHandleFactory *factory,
                      SpaHandle              *handle,
                      const SpaDict          *info,
-                     const SpaInterface    **platform,
+                     const SpaSupport      **support,
-                     unsigned int            n_platform)
+                     unsigned int            n_support)
 {
   SpaAudioMixer *this;
 

spa/plugins/audiotestsrc/audiotestsrc.c

@@ -989,8 +989,8 @@ static SpaResult
 audiotestsrc_init (const SpaHandleFactory  *factory,
                    SpaHandle               *handle,
                    const SpaDict           *info,
-                   const SpaInterface     **platform,
+                   const SpaSupport       **support,
-                   unsigned int             n_platform)
+                   unsigned int             n_support)
 {
   SpaAudioTestSrc *this;
 

spa/plugins/ffmpeg/ffmpeg.c

@@ -32,8 +32,8 @@ static SpaResult
 ffmpeg_dec_init (const SpaHandleFactory  *factory,
                  SpaHandle               *handle,
                  const SpaDict           *info,
-                 const SpaInterface     **platform,
+                 const SpaSupport       **support,
-                 unsigned int             n_platform)
+                 unsigned int             n_support)
 {
   if (factory == NULL || handle == NULL)
     return SPA_RESULT_INVALID_ARGUMENTS;
@@ -45,8 +45,8 @@ static SpaResult
 ffmpeg_enc_init (const SpaHandleFactory  *factory,
                  SpaHandle               *handle,
                  const SpaDict           *info,
-                 const SpaInterface     **platform,
+                 const SpaSupport       **support,
-                 unsigned int             n_platform)
+                 unsigned int             n_support)
 {
   if (factory == NULL || handle == NULL)
     return SPA_RESULT_INVALID_ARGUMENTS;

spa/plugins/remote/proxy.c

@@ -1348,8 +1348,8 @@ static SpaResult
 proxy_init (const SpaHandleFactory  *factory,
             SpaHandle               *handle,
             const SpaDict           *info,
-            const SpaInterface     **platform,
+            const SpaSupport       **support,
-            unsigned int             n_platform)
+            unsigned int             n_support)
 {
   SpaProxy *this;
 

spa/plugins/v4l2/v4l2-monitor.c

@@ -351,8 +351,8 @@ static SpaResult
 v4l2_monitor_init (const SpaHandleFactory  *factory,
                    SpaHandle               *handle,
                    const SpaDict           *info,
-                   const SpaInterface     **platform,
+                   const SpaSupport       **support,
-                   unsigned int             n_platform)
+                   unsigned int             n_support)
 {
   SpaV4l2Monitor *this;
 

spa/plugins/v4l2/v4l2-source.c

@@ -831,8 +831,8 @@ static SpaResult
 v4l2_source_init (const SpaHandleFactory  *factory,
                   SpaHandle               *handle,
                   const SpaDict           *info,
-                  const SpaInterface     **platform,
+                  const SpaSupport       **support,
-                  unsigned int             n_platform)
+                  unsigned int             n_support)
 {
   SpaV4l2Source *this;
   unsigned int i;

spa/plugins/videotestsrc/videotestsrc.c

@@ -937,8 +937,8 @@ static SpaResult
 videotestsrc_init (const SpaHandleFactory  *factory,
                    SpaHandle               *handle,
                    const SpaDict           *info,
-                   const SpaInterface     **platform,
+                   const SpaSupport       **support,
-                   unsigned int             n_platform)
+                   unsigned int             n_support)
 {
   SpaVideoTestSrc *this;
 

spa/plugins/volume/volume.c

@@ -677,8 +677,8 @@ static SpaResult
 volume_init (const SpaHandleFactory  *factory,
              SpaHandle               *handle,
              const SpaDict           *info,
-             const SpaInterface     **platform,
+             const SpaSupport       **support,
-             unsigned int             n_platform)
+             unsigned int             n_support)
 {
   SpaVolume *this;
 

spa/plugins/xv/xv-sink.c

@@ -558,8 +558,8 @@ static SpaResult
 xv_sink_init (const SpaHandleFactory  *factory,
               SpaHandle               *handle,
               const SpaDict           *info,
-              const SpaInterface     **platform,
+              const SpaSupport       **support,
-              unsigned int             n_platform)
+              unsigned int             n_support)
 {
   SpaXvSink *this;