From e5809cf4f41c2caf7fc2f71a3394a8430e3bd808 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 3 Apr 2023 21:30:11 +0200 Subject: [PATCH] spa: move audio props to audio section --- spa/include/spa/param/props-types.h | 10 +++++----- spa/include/spa/param/props.h | 13 ++++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/spa/include/spa/param/props-types.h b/spa/include/spa/param/props-types.h index ae3440158..e00f2f875 100644 --- a/spa/include/spa/param/props-types.h +++ b/spa/include/spa/param/props-types.h @@ -44,11 +44,6 @@ static const struct spa_type_info spa_type_props[] = { { SPA_PROP_waveType, SPA_TYPE_Id, SPA_TYPE_INFO_PROPS_BASE "waveType", NULL }, { SPA_PROP_frequency, SPA_TYPE_Int, SPA_TYPE_INFO_PROPS_BASE "frequency", NULL }, { SPA_PROP_volume, SPA_TYPE_Float, SPA_TYPE_INFO_PROPS_BASE "volume", NULL }, - { SPA_PROP_volumeRampSamples, SPA_TYPE_Int, SPA_TYPE_INFO_PROPS_BASE "volumeRampSamples", NULL }, - { SPA_PROP_volumeRampStepSamples, SPA_TYPE_Int, SPA_TYPE_INFO_PROPS_BASE "volumeRampStepSamples", NULL }, - { SPA_PROP_volumeRampTime, SPA_TYPE_Int, SPA_TYPE_INFO_PROPS_BASE "volumeRampTime", NULL }, - { SPA_PROP_volumeRampStepTime, SPA_TYPE_Int, SPA_TYPE_INFO_PROPS_BASE "volumeRampStepTime", NULL }, - { SPA_PROP_volumeRampScale, SPA_TYPE_Id, SPA_TYPE_INFO_PROPS_BASE "volumeRampScale", NULL }, { SPA_PROP_mute, SPA_TYPE_Bool, SPA_TYPE_INFO_PROPS_BASE "mute", NULL }, { SPA_PROP_patternType, SPA_TYPE_Id, SPA_TYPE_INFO_PROPS_BASE "patternType", NULL }, { SPA_PROP_ditherType, SPA_TYPE_Id, SPA_TYPE_INFO_PROPS_BASE "ditherType", NULL }, @@ -63,6 +58,11 @@ static const struct spa_type_info spa_type_props[] = { { SPA_PROP_softMute, SPA_TYPE_Bool, SPA_TYPE_INFO_PROPS_BASE "softMute", NULL }, { SPA_PROP_softVolumes, SPA_TYPE_Array, SPA_TYPE_INFO_PROPS_BASE "softVolumes", spa_type_prop_float_array }, { SPA_PROP_iec958Codecs, SPA_TYPE_Array, SPA_TYPE_INFO_PROPS_BASE "iec958Codecs", spa_type_prop_iec958_codec }, + { SPA_PROP_volumeRampSamples, SPA_TYPE_Int, SPA_TYPE_INFO_PROPS_BASE "volumeRampSamples", NULL }, + { SPA_PROP_volumeRampStepSamples, SPA_TYPE_Int, SPA_TYPE_INFO_PROPS_BASE "volumeRampStepSamples", NULL }, + { SPA_PROP_volumeRampTime, SPA_TYPE_Int, SPA_TYPE_INFO_PROPS_BASE "volumeRampTime", NULL }, + { SPA_PROP_volumeRampStepTime, SPA_TYPE_Int, SPA_TYPE_INFO_PROPS_BASE "volumeRampStepTime", NULL }, + { SPA_PROP_volumeRampScale, SPA_TYPE_Id, SPA_TYPE_INFO_PROPS_BASE "volumeRampScale", NULL }, { SPA_PROP_brightness, SPA_TYPE_Int, SPA_TYPE_INFO_PROPS_BASE "brightness", NULL }, { SPA_PROP_contrast, SPA_TYPE_Int, SPA_TYPE_INFO_PROPS_BASE "contrast", NULL }, diff --git a/spa/include/spa/param/props.h b/spa/include/spa/param/props.h index 63a3264d9..8e59e8ce2 100644 --- a/spa/include/spa/param/props.h +++ b/spa/include/spa/param/props.h @@ -80,6 +80,14 @@ enum spa_prop { SPA_PROP_iec958Codecs, /**< enabled IEC958 (S/PDIF) codecs, * (Array (Id enum spa_audio_iec958_codec) */ + SPA_PROP_volumeRampSamples, /**< Samples to ramp the volume over */ + SPA_PROP_volumeRampStepSamples, /**< Step or incremental Samples to ramp + * the volume over */ + SPA_PROP_volumeRampTime, /**< Time in millisec to ramp the volume over */ + SPA_PROP_volumeRampStepTime, /**< Step or incremental Time in nano seconds + * to ramp the */ + SPA_PROP_volumeRampScale, /**< the scale or graph to used to ramp the + * volume */ SPA_PROP_START_Video = 0x20000, /**< video related properties */ SPA_PROP_brightness, @@ -90,11 +98,6 @@ enum spa_prop { SPA_PROP_exposure, SPA_PROP_gain, SPA_PROP_sharpness, - SPA_PROP_volumeRampSamples, /**< Samples to ramp the volume over */ - SPA_PROP_volumeRampStepSamples, /**< Step or incremental Samples to ramp the volume over */ - SPA_PROP_volumeRampTime, /**< Time in millisec to ramp the volume over */ - SPA_PROP_volumeRampStepTime, /**< Step or incremental Time in nano seconds to ramp the */ - SPA_PROP_volumeRampScale, /**< the scale or graph to used to ramp the volume */ SPA_PROP_START_Other = 0x80000, /**< other properties */ SPA_PROP_params, /**< simple control params