aboutsummaryrefslogtreecommitdiffstats
path: root/Audio-Common
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-08-23 10:54:30 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-08-23 10:54:30 +0200
commitd0dae04c2ae6e4219e0ebac205dd05fa7e9427cf (patch)
tree80c6fc84f56afedc4fb02a097ae3e464bd792828 /Audio-Common
parent606ccd2405a55eab4c909160c951c083bccd825d (diff)
Format: remove blank space at EOL
Change-Id: I786ac8d5be68bdf09d5bb6c883959d6e1963c1fe Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'Audio-Common')
-rw-r--r--Audio-Common/audio-common.c28
-rw-r--r--Audio-Common/audio-common.h40
2 files changed, 34 insertions, 34 deletions
diff --git a/Audio-Common/audio-common.c b/Audio-Common/audio-common.c
index ae41dde..b75cd9b 100644
--- a/Audio-Common/audio-common.c
+++ b/Audio-Common/audio-common.c
@@ -13,13 +13,13 @@
* 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",
@@ -27,30 +27,30 @@ PUBLIC const char *halCtlsLabels[] = {
[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",
-
+ [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",
+ [Multimedia_Playback_Volume] = "Multimedia_Playback_Volume",
[Navigation_Playback_Volume] = "Navigation_Playback_Volume",
- [Emergency_Playback_Volume] = "Emergency_Playback_Volume",
+ [Emergency_Playback_Volume] = "Emergency_Playback_Volume",
- // Do not remove EndHalCrlTag
+ // 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) {
diff --git a/Audio-Common/audio-common.h b/Audio-Common/audio-common.h
index c61b07f..82ada36 100644
--- a/Audio-Common/audio-common.h
+++ b/Audio-Common/audio-common.h
@@ -13,10 +13,10 @@
* 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:
+ *
+ * reference:
* amixer contents; amixer controls;
- * http://www.tldp.org/HOWTO/Alsa-sound-6.html
+ * http://www.tldp.org/HOWTO/Alsa-sound-6.html
*/
#ifndef AUDIO_INTERF_H
@@ -41,10 +41,10 @@
#define CTL_AUTO -1
typedef enum {
- QUERY_QUIET =0,
- QUERY_COMPACT =1,
- QUERY_VERBOSE =2,
- QUERY_FULL =3,
+ QUERY_QUIET =0,
+ QUERY_COMPACT =1,
+ QUERY_VERBOSE =2,
+ QUERY_FULL =3,
} halQueryMode;
// Most controls are MIXER but some vendor specific are possible
@@ -68,12 +68,12 @@ 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,
-
+ 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,
@@ -81,12 +81,12 @@ typedef enum {
PCM_Playback_Switch,
Capture_Volume,
Master_OnOff_Switch,
-
+
// Application Virtual Channels
- Multimedia_Playback_Volume,
- Navigation_Playback_Volume,
- Emergency_Playback_Volume,
-
+ Multimedia_Playback_Volume,
+ Navigation_Playback_Volume,
+ Emergency_Playback_Volume,
+
EndHalCrlTag // used to compute number of ctls
} halCtlsTagT;
@@ -96,9 +96,9 @@ typedef enum {
RAMP_VOL_NORMAL = 1,
RAMP_VOL_SMOOTH = 2,
RAMP_VOL_EMERGENCY = 3,
-
+
EndHalVolMod
-
+
} halRampEnumT;
PUBLIC void pingtest(struct afb_req request);