From 521281617cec5d89725c4844eac68b5a772fab57 Mon Sep 17 00:00:00 2001 From: Fulup Ar Foll Date: Sat, 11 Mar 2017 00:27:30 +0100 Subject: Work in Progress Static/Dynamic Lib Fixed. Source Tree cleaned up Compile but to be tested Business Logic not done --- AlsaSound/HALayer/include/AlsaHalCtls.h | 57 -------------------------------- AlsaSound/HALayer/include/AlsaHalIface.h | 52 ----------------------------- AlsaSound/HALayer/include/MiscHelpers.h | 33 ------------------ 3 files changed, 142 deletions(-) delete mode 100644 AlsaSound/HALayer/include/AlsaHalCtls.h delete mode 100644 AlsaSound/HALayer/include/AlsaHalIface.h delete mode 100644 AlsaSound/HALayer/include/MiscHelpers.h (limited to 'AlsaSound/HALayer/include') diff --git a/AlsaSound/HALayer/include/AlsaHalCtls.h b/AlsaSound/HALayer/include/AlsaHalCtls.h deleted file mode 100644 index a17315a..0000000 --- a/AlsaSound/HALayer/include/AlsaHalCtls.h +++ /dev/null @@ -1,57 +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 ALSAMIXERMAP_H -#define ALSAMIXERMAP_H - -// Most controls are MIXER but some vendor specific are possible -typedef enum { - OUTVOL, - PCMVOL, - INVOL, - SWITCH, - ROUTE, - CARD, -} halGroupEnumT; - -typedef enum { - READ, - WRITE, - RW, -} halAclEnumT; - -typedef enum { - StartHalCrlTag=0, - - // HighLevel Audio Control List - Master_Playback_Volume, - PCM_Playback_Volume, - PCM_Playback_Switch, - Capture_Volume, - - EndHalCrlTag // used to compute number of ctls -} halControlEnumT; - - -#endif /* ALSAMIXERMAP_H */ - diff --git a/AlsaSound/HALayer/include/AlsaHalIface.h b/AlsaSound/HALayer/include/AlsaHalIface.h deleted file mode 100644 index 83ab57c..0000000 --- a/AlsaSound/HALayer/include/AlsaHalIface.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * AlsaLibMapping -- provide low level interface with AUDIO lib (extracted from alsa-json-gateway code) - * Copyright (C) 2015,2016,2017, Fulup Ar Foll fulup@iot.bzh - * - * 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. - */ - -#ifndef SHAREDHALLIB_H -#define SHAREDHALLIB_H - -#include -#include - -#include "MiscHelpers.h" -#include "AlsaHalCtls.h" - -typedef const struct { - halControlEnumT control; - int numid; - halGroupEnumT group; - int values; - int minval; - int maxval; - int step; - char* info; - halAclEnumT acl; - -} alsaHalCtlMapT; - -typedef struct { - const char *prefix; - const char *name; - const char *info; - alsaHalCtlMapT *ctls; - -} alsaHalSndCardT; - -PUBLIC alsaHalSndCardT alsaHalSndCard; -PUBLIC struct afb_binding alsaHalBinding; - -#endif /* SHAREDHALLIB_H */ - diff --git a/AlsaSound/HALayer/include/MiscHelpers.h b/AlsaSound/HALayer/include/MiscHelpers.h deleted file mode 100644 index 0181847..0000000 --- a/AlsaSound/HALayer/include/MiscHelpers.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * AlsaLibMapping -- provide low level interface with AUDIO lib (extracted from alsa-json-gateway code) - * Copyright (C) 2015,2016,2017, Fulup Ar Foll fulup@iot.bzh - * - * 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. - */ - -#ifndef MISCHELPER_H -#define MISCHELPER_H - -#ifndef PUBLIC - #define PUBLIC -#endif -#ifndef FALSE - #define FALSE 0 -#endif -#ifndef TRUE - #define TRUE 1 -#endif -#define STATIC static - -#endif /* MISCHELPER_H */ - -- cgit 1.2.3-korg