From 6561612a64a52d93260444066a266adb06ac71ad Mon Sep 17 00:00:00 2001 From: Fulup Ar Foll Date: Tue, 24 Oct 2017 22:12:48 +0200 Subject: Initial working version as independent repo --- Audio-Common/CMakeLists.txt | 39 --------------- Audio-Common/audio-common.c | 65 ------------------------- Audio-Common/audio-common.h | 115 -------------------------------------------- 3 files changed, 219 deletions(-) delete mode 100644 Audio-Common/CMakeLists.txt delete mode 100644 Audio-Common/audio-common.c delete mode 100644 Audio-Common/audio-common.h (limited to 'Audio-Common') diff --git a/Audio-Common/CMakeLists.txt b/Audio-Common/CMakeLists.txt deleted file mode 100644 index 72e0df7..0000000 --- a/Audio-Common/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -########################################################################### -# Copyright 2015, 2016, 2017 IoT.bzh -# -# author: Fulup Ar Foll -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -########################################################################### - -# Add target to project dependency list -PROJECT_TARGET_ADD(audio-common) - - # Define targets - ADD_LIBRARY(${TARGET_NAME} STATIC audio-common.c) - - # Library properties - SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES - OUTPUT_NAME ${TARGET_NAME} - ) - - # Library dependencies - TARGET_LINK_LIBRARIES(${TARGET_NAME} - afb-utilities - ${link_libraries} - ) - - # Define target includes - TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} -) diff --git a/Audio-Common/audio-common.c b/Audio-Common/audio-common.c deleted file mode 100644 index 25629b5..0000000 --- a/Audio-Common/audio-common.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2016 "IoT.bzh" - * Author Fulup Ar Foll - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -#define _GNU_SOURCE // needed for vasprintf -#include "audio-common.h" - -PUBLIC const char *halCtlsLabels[] = { - - [Master_Playback_Volume] = "Master_Playback_Volume", - [Master_OnOff_Switch] = "Master_OnOff_Switch", - [Master_Playback_Ramp]= "Master_Playback_Ramp", - [PCM_Playback_Volume] = "PCM_Playback_Volume", - [PCM_Playback_Switch] = "PCM_Playback_Switch", - [Capture_Volume] = "Capture_Volume", - - [Vol_Ramp_Set_Mode] = "Volume_Ramp_Mode", - [Vol_Ramp_Set_Delay] = "Volume_Ramp_Delay", - [Vol_Ramp_Set_Down] = "Volume_Ramp_Down", - [Vol_Ramp_Set_Up] = "Volume_Ramp_Up", - [Vol_Ramp_Set_Slave] = "Volume_Ramp_Slave", - - // Application Virtual Channels - [Multimedia_Playback_Volume] = "Multimedia_Playback_Volume", - [Navigation_Playback_Volume] = "Navigation_Playback_Volume", - [Emergency_Playback_Volume] = "Emergency_Playback_Volume", - [Telephony_Playback_Volume] = "Telephony_Playback_Volume", - - [Multimedia_Playback_Switch] = "Multimedia_Playback_Switch", - [Navigation_Playback_Switch] = "Navigation_Playback_Switch", - [Emergency_Playback_Switch] = "Emergency_Playback_Switch", - [Telephony_Playback_Switch] = "Telephony_Playback_Switch", - - // Do not remove EndHalCrlTag - [EndHalCrlTag] = NULL -}; - -PUBLIC const char *halVolRampModes[] = { - - [RAMP_VOL_NONE] = "None", - [RAMP_VOL_NORMAL] = "Normal", - [RAMP_VOL_SMOOTH] = "Smooth", - [RAMP_VOL_EMERGENCY] = "Emergency", - - [EndHalVolMod] = NULL, - -}; - -PUBLIC void pingtest(struct afb_req request) { - json_object *query = afb_req_json(request); - afb_req_success(request, query, NULL); -} diff --git a/Audio-Common/audio-common.h b/Audio-Common/audio-common.h deleted file mode 100644 index 7077eab..0000000 --- a/Audio-Common/audio-common.h +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (C) 2016 "IoT.bzh" - * Author Fulup Ar Foll - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * reference: - * amixer contents; amixer controls; - * http://www.tldp.org/HOWTO/Alsa-sound-6.html - */ - -#ifndef AUDIO_INTERF_H -#define AUDIO_INTERF_H - -#define AFB_BINDING_VERSION 2 -#include -#include -#include -#include - -// Waiting for official macro from José -#define AFB_GET_VERBOSITY afb_get_verbosity_v2() - -#ifndef PUBLIC - #define PUBLIC -#endif -#define STATIC static - - -// Soft control have dynamically allocated numid -#define CTL_AUTO -1 - -typedef enum { - QUERY_QUIET =0, - QUERY_COMPACT =1, - QUERY_VERBOSE =2, - QUERY_FULL =3, -} halQueryMode; - -// Most controls are MIXER but some vendor specific are possible -typedef enum { - OUTVOL, - PCMVOL, - INVOL, - SWITCH, - ROUTE, - CARD, - ENUM, -} halGroupEnumT; - -typedef enum { - READ, - WRITE, - RW, -} halAclEnumT; - -typedef enum { - StartHalCrlTag=0, - - // volume RAMP - Vol_Ramp_Set_Mode, - Vol_Ramp_Set_Delay, - Vol_Ramp_Set_Down, - Vol_Ramp_Set_Up, - Vol_Ramp_Set_Slave, - - // HighLevel Audio Control List, - Master_Playback_Volume, - Master_Playback_Ramp, - PCM_Playback_Volume, - PCM_Playback_Switch, - Capture_Volume, - Master_OnOff_Switch, - Telephony_Playback_Volume, - Multimedia_Playback_Switch, - Navigation_Playback_Switch, - Emergency_Playback_Switch, - Telephony_Playback_Switch, - - - // Application Virtual Channels - Multimedia_Playback_Volume, - Navigation_Playback_Volume, - Emergency_Playback_Volume, - - EndHalCrlTag // used to compute number of ctls -} halCtlsTagT; - - -typedef enum { - RAMP_VOL_NONE = 0, - RAMP_VOL_NORMAL = 1, - RAMP_VOL_SMOOTH = 2, - RAMP_VOL_EMERGENCY = 3, - - EndHalVolMod - -} halRampEnumT; - -PUBLIC void pingtest(struct afb_req request); -extern const char *halVolRampModes[]; -extern const char *halCtlsLabels[]; - -#endif /* AUDIO_INTERF_H */ - -- cgit 1.2.3-korg