Skip to content

Commit

Permalink
spotify_source: new clang-format indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
Juan A. Rubio committed Nov 13, 2016
1 parent 0175efb commit 81a0096
Show file tree
Hide file tree
Showing 8 changed files with 536 additions and 475 deletions.
68 changes: 34 additions & 34 deletions plugins/spotify_source/src/spfysrc.c
View file
Expand Up @@ -60,19 +60,17 @@
*@ingroup plugins
*/

static OMX_VERSIONTYPE spotify_source_version = { {1, 0, 0, 0} };
static OMX_VERSIONTYPE spotify_source_version = {{1, 0, 0, 0}};

static OMX_PTR instantiate_pcm_port (OMX_HANDLETYPE ap_hdl)
static OMX_PTR
instantiate_pcm_port (OMX_HANDLETYPE ap_hdl)
{
OMX_AUDIO_PARAM_PCMMODETYPE pcmmode;
OMX_AUDIO_CONFIG_VOLUMETYPE volume;
OMX_AUDIO_CONFIG_MUTETYPE mute;
OMX_AUDIO_CODINGTYPE encodings[] = {
OMX_AUDIO_CodingUnused,
OMX_AUDIO_CodingAutoDetect,
OMX_AUDIO_CodingPCM,
OMX_AUDIO_CodingMax
};
OMX_AUDIO_CODINGTYPE encodings[]
= {OMX_AUDIO_CodingUnused, OMX_AUDIO_CodingAutoDetect, OMX_AUDIO_CodingPCM,
OMX_AUDIO_CodingMax};
tiz_port_options_t port_opts = {
OMX_PortDomainAudio,
OMX_DirOutput,
Expand All @@ -86,31 +84,31 @@ static OMX_PTR instantiate_pcm_port (OMX_HANDLETYPE ap_hdl)
};

/* Instantiate the pcm port */
pcmmode.nSize = sizeof (OMX_AUDIO_PARAM_PCMMODETYPE);
pcmmode.nVersion.nVersion = OMX_VERSION;
pcmmode.nPortIndex = ARATELIA_SPOTIFY_SOURCE_PORT_INDEX;
pcmmode.nChannels = 2;
pcmmode.eNumData = OMX_NumericalDataSigned;
pcmmode.eEndian = OMX_EndianLittle;
pcmmode.bInterleaved = OMX_TRUE;
pcmmode.nBitPerSample = 16;
pcmmode.nSamplingRate = 48000;
pcmmode.ePCMMode = OMX_AUDIO_PCMModeLinear;
pcmmode.nSize = sizeof (OMX_AUDIO_PARAM_PCMMODETYPE);
pcmmode.nVersion.nVersion = OMX_VERSION;
pcmmode.nPortIndex = ARATELIA_SPOTIFY_SOURCE_PORT_INDEX;
pcmmode.nChannels = 2;
pcmmode.eNumData = OMX_NumericalDataSigned;
pcmmode.eEndian = OMX_EndianLittle;
pcmmode.bInterleaved = OMX_TRUE;
pcmmode.nBitPerSample = 16;
pcmmode.nSamplingRate = 48000;
pcmmode.ePCMMode = OMX_AUDIO_PCMModeLinear;
pcmmode.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
pcmmode.eChannelMapping[1] = OMX_AUDIO_ChannelRF;

volume.nSize = sizeof (OMX_AUDIO_CONFIG_VOLUMETYPE);
volume.nSize = sizeof (OMX_AUDIO_CONFIG_VOLUMETYPE);
volume.nVersion.nVersion = OMX_VERSION;
volume.nPortIndex = ARATELIA_SPOTIFY_SOURCE_PORT_INDEX;
volume.bLinear = OMX_FALSE;
volume.sVolume.nValue = ARATELIA_SPOTIFY_SOURCE_DEFAULT_VOLUME_VALUE;
volume.sVolume.nMin = ARATELIA_SPOTIFY_SOURCE_MIN_VOLUME_VALUE;
volume.sVolume.nMax = ARATELIA_SPOTIFY_SOURCE_MAX_VOLUME_VALUE;
volume.nPortIndex = ARATELIA_SPOTIFY_SOURCE_PORT_INDEX;
volume.bLinear = OMX_FALSE;
volume.sVolume.nValue = ARATELIA_SPOTIFY_SOURCE_DEFAULT_VOLUME_VALUE;
volume.sVolume.nMin = ARATELIA_SPOTIFY_SOURCE_MIN_VOLUME_VALUE;
volume.sVolume.nMax = ARATELIA_SPOTIFY_SOURCE_MAX_VOLUME_VALUE;

mute.nSize = sizeof (OMX_AUDIO_CONFIG_MUTETYPE);
mute.nSize = sizeof (OMX_AUDIO_CONFIG_MUTETYPE);
mute.nVersion.nVersion = OMX_VERSION;
mute.nPortIndex = ARATELIA_SPOTIFY_SOURCE_PORT_INDEX;
mute.bMute = OMX_FALSE;
mute.nPortIndex = ARATELIA_SPOTIFY_SOURCE_PORT_INDEX;
mute.bMute = OMX_FALSE;

return factory_new (tiz_get_type (ap_hdl, "tizpcmport"), &port_opts,
&encodings, &pcmmode, &volume, &mute);
Expand All @@ -120,7 +118,7 @@ static OMX_PTR
instantiate_config_port (OMX_HANDLETYPE ap_hdl)
{
return factory_new (tiz_get_type (ap_hdl, "spfysrccfgport"),
NULL, /* this port does not take options */
NULL, /* this port does not take options */
ARATELIA_SPOTIFY_SOURCE_COMPONENT_NAME,
spotify_source_version);
}
Expand All @@ -135,16 +133,17 @@ OMX_ERRORTYPE
OMX_ComponentInit (OMX_HANDLETYPE ap_hdl)
{
tiz_role_factory_t role_factory;
const tiz_role_factory_t *rf_list[] = { &role_factory };
const tiz_role_factory_t * rf_list[] = {&role_factory};
tiz_type_factory_t spfysrcprc_type;
tiz_type_factory_t spfysrccfgport_type;
const tiz_type_factory_t *tf_list[] = { &spfysrcprc_type, &spfysrccfgport_type };
const tiz_type_factory_t * tf_list[]
= {&spfysrcprc_type, &spfysrccfgport_type};

strcpy ((OMX_STRING) role_factory.role, ARATELIA_SPOTIFY_SOURCE_DEFAULT_ROLE);
role_factory.pf_cport = instantiate_config_port;
role_factory.pf_cport = instantiate_config_port;
role_factory.pf_port[0] = instantiate_pcm_port;
role_factory.nports = 1;
role_factory.pf_proc = instantiate_processor;
role_factory.nports = 1;
role_factory.pf_proc = instantiate_processor;

strcpy ((OMX_STRING) spfysrcprc_type.class_name, "spfysrcprc_class");
spfysrcprc_type.pf_class_init = spfysrc_prc_class_init;
Expand All @@ -157,7 +156,8 @@ OMX_ComponentInit (OMX_HANDLETYPE ap_hdl)
spfysrccfgport_type.pf_object_init = spfysrc_cfgport_init;

/* Initialize the component infrastructure */
tiz_check_omx (tiz_comp_init (ap_hdl, ARATELIA_SPOTIFY_SOURCE_COMPONENT_NAME));
tiz_check_omx (
tiz_comp_init (ap_hdl, ARATELIA_SPOTIFY_SOURCE_COMPONENT_NAME));

/* Register the "spfysrcprc" and "spfysrccfgport" classes */
tiz_check_omx (tiz_comp_register_types (ap_hdl, tf_list, 2));
Expand Down
36 changes: 18 additions & 18 deletions plugins/spotify_source/src/spfysrc.h
View file
Expand Up @@ -29,33 +29,33 @@
#define SPFYSRC_H

#ifdef __cplusplus
extern "C"
{
extern "C" {
#endif

#include <OMX_Core.h>
#include <OMX_Types.h>
#include <OMX_TizoniaExt.h>

#define ARATELIA_SPOTIFY_SOURCE_DEFAULT_ROLE OMX_ROLE_AUDIO_SOURCE_PCM_SPOTIFY
#define ARATELIA_SPOTIFY_SOURCE_COMPONENT_NAME "OMX.Aratelia.audio_source.spotify.pcm"
/* With libtizonia, port indexes must start at index 0 */
#define ARATELIA_SPOTIFY_SOURCE_PORT_INDEX 0
#define ARATELIA_SPOTIFY_SOURCE_PORT_MIN_BUF_COUNT 3
#define ARATELIA_SPOTIFY_SOURCE_PORT_MIN_BUF_SIZE 8192 * 12
#define ARATELIA_SPOTIFY_SOURCE_PORT_NONCONTIGUOUS OMX_FALSE
#define ARATELIA_SPOTIFY_SOURCE_PORT_ALIGNMENT 0
#define ARATELIA_SPOTIFY_SOURCE_PORT_SUPPLIERPREF OMX_BufferSupplyInput
#define ARATELIA_SPOTIFY_SOURCE_DEFAULT_VOLUME_VALUE 75
#define ARATELIA_SPOTIFY_SOURCE_MAX_VOLUME_VALUE 100
#define ARATELIA_SPOTIFY_SOURCE_MIN_VOLUME_VALUE 0
#define ARATELIA_SPOTIFY_SOURCE_DEFAULT_ROLE OMX_ROLE_AUDIO_SOURCE_PCM_SPOTIFY
#define ARATELIA_SPOTIFY_SOURCE_COMPONENT_NAME \
"OMX.Aratelia.audio_source.spotify.pcm"
/* With libtizonia, port indexes must start at index 0 */
#define ARATELIA_SPOTIFY_SOURCE_PORT_INDEX 0
#define ARATELIA_SPOTIFY_SOURCE_PORT_MIN_BUF_COUNT 3
#define ARATELIA_SPOTIFY_SOURCE_PORT_MIN_BUF_SIZE 8192 * 12
#define ARATELIA_SPOTIFY_SOURCE_PORT_NONCONTIGUOUS OMX_FALSE
#define ARATELIA_SPOTIFY_SOURCE_PORT_ALIGNMENT 0
#define ARATELIA_SPOTIFY_SOURCE_PORT_SUPPLIERPREF OMX_BufferSupplyInput
#define ARATELIA_SPOTIFY_SOURCE_DEFAULT_VOLUME_VALUE 75
#define ARATELIA_SPOTIFY_SOURCE_MAX_VOLUME_VALUE 100
#define ARATELIA_SPOTIFY_SOURCE_MIN_VOLUME_VALUE 0
#define ARATELIA_SPOTIFY_SOURCE_DEFAULT_BIT_RATE_KBITS 320
#define ARATELIA_SPOTIFY_SOURCE_DEFAULT_CACHE_SECONDS 6
#define ARATELIA_SPOTIFY_SOURCE_MIN_CACHE_SECONDS 7
#define ARATELIA_SPOTIFY_SOURCE_MAX_CACHE_SECONDS 12
#define ARATELIA_SPOTIFY_SOURCE_DEFAULT_CACHE_SECONDS 6
#define ARATELIA_SPOTIFY_SOURCE_MIN_CACHE_SECONDS 7
#define ARATELIA_SPOTIFY_SOURCE_MAX_CACHE_SECONDS 12

#ifdef __cplusplus
}
#endif

#endif /* SPFYSRC_H */
#endif /* SPFYSRC_H */
79 changes: 39 additions & 40 deletions plugins/spotify_source/src/spfysrccfgport.c
View file
Expand Up @@ -49,40 +49,41 @@
* spfysrccfgport class
*/

static void *spfysrc_cfgport_ctor (void *ap_obj, va_list *app)
static void *
spfysrc_cfgport_ctor (void * ap_obj, va_list * app)
{
spfysrc_cfgport_t *p_obj
= super_ctor (typeOf (ap_obj, "spfysrccfgport"), ap_obj, app);
spfysrc_cfgport_t * p_obj
= super_ctor (typeOf (ap_obj, "spfysrccfgport"), ap_obj, app);

assert (p_obj);

tiz_check_omx_ret_null (tiz_port_register_index (
p_obj, OMX_TizoniaIndexParamAudioSpotifySession));
tiz_check_omx_ret_null (tiz_port_register_index (
p_obj, OMX_TizoniaIndexParamAudioSpotifyPlaylist));
tiz_check_omx_ret_null (
tiz_port_register_index (p_obj, OMX_TizoniaIndexParamAudioSpotifySession));
tiz_check_omx_ret_null (
tiz_port_register_index (p_obj, OMX_TizoniaIndexParamAudioSpotifyPlaylist));

/* Initialize the OMX_TIZONIA_AUDIO_PARAM_SPOTIFYSESSIONTYPE structure */
TIZ_INIT_OMX_STRUCT (p_obj->spotifysession_);
snprintf ((char *)p_obj->spotifysession_.cUserName,
sizeof(p_obj->spotifysession_.cUserName), "tizonia");
snprintf ((char *)p_obj->spotifysession_.cUserPassword,
sizeof(p_obj->spotifysession_.cUserPassword), "pass");
snprintf ((char *) p_obj->spotifysession_.cUserName,
sizeof (p_obj->spotifysession_.cUserName), "tizonia");
snprintf ((char *) p_obj->spotifysession_.cUserPassword,
sizeof (p_obj->spotifysession_.cUserPassword), "pass");
p_obj->spotifysession_.bRememberCredentials = OMX_TRUE;
p_obj->spotifysession_.ePreferredBitRate = OMX_AUDIO_SpotifyBitrate320Kbps;
p_obj->spotifysession_.eConnectionType
= OMX_AUDIO_SpotifyConnectionMobileWired;
= OMX_AUDIO_SpotifyConnectionMobileWired;

/* Initialize the OMX_TIZONIA_AUDIO_PARAM_SPOTIFYPLAYLISTTYPE structure */
TIZ_INIT_OMX_STRUCT (p_obj->playlist_);
snprintf ((char *)p_obj->playlist_.cPlaylistName,
sizeof(p_obj->playlist_.cPlaylistName), "playlist");
snprintf ((char *) p_obj->playlist_.cPlaylistName,
sizeof (p_obj->playlist_.cPlaylistName), "playlist");
p_obj->playlist_.bShuffle = OMX_FALSE;

return p_obj;
}

static void *
spfysrc_cfgport_dtor (void *ap_obj)
spfysrc_cfgport_dtor (void * ap_obj)
{
return super_dtor (typeOf (ap_obj, "spfysrccfgport"), ap_obj);
}
Expand All @@ -92,11 +93,10 @@ spfysrc_cfgport_dtor (void *ap_obj)
*/

static OMX_ERRORTYPE
spfysrc_cfgport_GetParameter (const void *ap_obj,
OMX_HANDLETYPE ap_hdl,
OMX_INDEXTYPE a_index, OMX_PTR ap_struct)
spfysrc_cfgport_GetParameter (const void * ap_obj, OMX_HANDLETYPE ap_hdl,
OMX_INDEXTYPE a_index, OMX_PTR ap_struct)
{
const spfysrc_cfgport_t *p_obj = ap_obj;
const spfysrc_cfgport_t * p_obj = ap_obj;
OMX_ERRORTYPE rc = OMX_ErrorNone;

assert (p_obj);
Expand All @@ -107,29 +107,28 @@ spfysrc_cfgport_GetParameter (const void *ap_obj,
if (OMX_TizoniaIndexParamAudioSpotifySession == a_index)
{
memcpy (ap_struct, &(p_obj->spotifysession_),
sizeof(OMX_TIZONIA_AUDIO_PARAM_SPOTIFYSESSIONTYPE));
sizeof (OMX_TIZONIA_AUDIO_PARAM_SPOTIFYSESSIONTYPE));
}
else if (OMX_TizoniaIndexParamAudioSpotifyPlaylist == a_index)
{
memcpy (ap_struct, &(p_obj->playlist_),
sizeof(OMX_TIZONIA_AUDIO_PARAM_SPOTIFYPLAYLISTTYPE));
sizeof (OMX_TIZONIA_AUDIO_PARAM_SPOTIFYPLAYLISTTYPE));
}
else
{
/* Delegate to the base port */
rc = super_GetParameter (typeOf (ap_obj, "spfysrccfgport"),
ap_obj, ap_hdl, a_index, ap_struct);
rc = super_GetParameter (typeOf (ap_obj, "spfysrccfgport"), ap_obj,
ap_hdl, a_index, ap_struct);
}

return rc;
}

static OMX_ERRORTYPE
spfysrc_cfgport_SetParameter (const void *ap_obj,
OMX_HANDLETYPE ap_hdl,
OMX_INDEXTYPE a_index, OMX_PTR ap_struct)
spfysrc_cfgport_SetParameter (const void * ap_obj, OMX_HANDLETYPE ap_hdl,
OMX_INDEXTYPE a_index, OMX_PTR ap_struct)
{
spfysrc_cfgport_t *p_obj = (spfysrc_cfgport_t *) ap_obj;
spfysrc_cfgport_t * p_obj = (spfysrc_cfgport_t *) ap_obj;
OMX_ERRORTYPE rc = OMX_ErrorNone;

assert (p_obj);
Expand All @@ -140,25 +139,26 @@ spfysrc_cfgport_SetParameter (const void *ap_obj,
if (OMX_TizoniaIndexParamAudioSpotifySession == a_index)
{
memcpy (&(p_obj->spotifysession_), ap_struct,
sizeof(OMX_TIZONIA_AUDIO_PARAM_SPOTIFYSESSIONTYPE));
sizeof (OMX_TIZONIA_AUDIO_PARAM_SPOTIFYSESSIONTYPE));
p_obj->spotifysession_.cUserName[OMX_MAX_STRINGNAME_SIZE - 1] = '\000';
p_obj->spotifysession_.cUserPassword[OMX_MAX_STRINGNAME_SIZE - 1] = '\000';
p_obj->spotifysession_.cUserPassword[OMX_MAX_STRINGNAME_SIZE - 1]
= '\000';
TIZ_TRACE (ap_hdl, "Spotify User Name [%s]...",
p_obj->spotifysession_.cUserName);
}
else if (OMX_TizoniaIndexParamAudioSpotifyPlaylist == a_index)
{
memcpy (&(p_obj->playlist_), ap_struct,
sizeof(OMX_TIZONIA_AUDIO_PARAM_SPOTIFYPLAYLISTTYPE));
sizeof (OMX_TIZONIA_AUDIO_PARAM_SPOTIFYPLAYLISTTYPE));
p_obj->playlist_.cPlaylistName[OMX_MAX_STRINGNAME_SIZE - 1] = '\000';
TIZ_TRACE (ap_hdl, "Spotify playlist [%s]...",
p_obj->playlist_.cPlaylistName);
}
else
{
/* Delegate to the base port */
rc = super_SetParameter (typeOf (ap_obj, "spfysrccfgport"),
ap_obj, ap_hdl, a_index, ap_struct);
rc = super_SetParameter (typeOf (ap_obj, "spfysrccfgport"), ap_obj,
ap_hdl, a_index, ap_struct);
}

return rc;
Expand All @@ -169,7 +169,7 @@ spfysrc_cfgport_SetParameter (const void *ap_obj,
*/

static void *
spfysrc_cfgport_class_ctor (void *ap_obj, va_list * app)
spfysrc_cfgport_class_ctor (void * ap_obj, va_list * app)
{
/* NOTE: Class methods might be added in the future. None for now. */
return super_ctor (typeOf (ap_obj, "spfysrccfgport_class"), ap_obj, app);
Expand All @@ -183,12 +183,10 @@ void *
spfysrc_cfgport_class_init (void * ap_tos, void * ap_hdl)
{
void * tizconfigport = tiz_get_type (ap_hdl, "tizconfigport");
void * spfysrccfgport_class = factory_new (classOf (tizconfigport),
"spfysrccfgport_class",
classOf (tizconfigport),
sizeof (spfysrc_cfgport_class_t),
ap_tos, ap_hdl,
ctor, spfysrc_cfgport_class_ctor, 0);
void * spfysrccfgport_class
= factory_new (classOf (tizconfigport), "spfysrccfgport_class",
classOf (tizconfigport), sizeof (spfysrc_cfgport_class_t),
ap_tos, ap_hdl, ctor, spfysrc_cfgport_class_ctor, 0);
return spfysrccfgport_class;
}

Expand All @@ -200,7 +198,8 @@ spfysrc_cfgport_init (void * ap_tos, void * ap_hdl)
TIZ_LOG_CLASS (spfysrccfgport_class);
void * spfysrccfgport = factory_new
/* TIZ_CLASS_COMMENT: class type, class name, parent, size */
(spfysrccfgport_class, "spfysrccfgport", tizconfigport, sizeof (spfysrc_cfgport_t),
(spfysrccfgport_class, "spfysrccfgport", tizconfigport,
sizeof (spfysrc_cfgport_t),
/* TIZ_CLASS_COMMENT: class constructor */
ap_tos, ap_hdl,
/* TIZ_CLASS_COMMENT: class constructor */
Expand Down
11 changes: 6 additions & 5 deletions plugins/spotify_source/src/spfysrccfgport.h
View file
Expand Up @@ -30,15 +30,16 @@
#define SPFYSRCCFGPORT_H

#ifdef __cplusplus
extern "C"
{
extern "C" {
#endif

void * spfysrc_cfgport_class_init (void * ap_tos, void * ap_hdl);
void * spfysrc_cfgport_init (void * ap_tos, void * ap_hdl);
void *
spfysrc_cfgport_class_init (void * ap_tos, void * ap_hdl);
void *
spfysrc_cfgport_init (void * ap_tos, void * ap_hdl);

#ifdef __cplusplus
}
#endif

#endif /* SPFYSRCCFGPORT_H */
#endif /* SPFYSRCCFGPORT_H */

0 comments on commit 81a0096

Please sign in to comment.