Skip to content

Commit e7dd15b

Browse files
author
Martin Koch
authored
Merge pull request #16 from GENIVI/GC_reworked_controller
GC: Introduce new version of generic controller plugin
2 parents b5090c9 + 44502f4 commit e7dd15b

177 files changed

Lines changed: 29605 additions & 20266 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎PluginControlInterfaceGeneric/CMakeLists.txt‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
33
INCLUDE(CMakeDependentOption)
44
FIND_PACKAGE(PkgConfig)
55

6-
PROJECT(PluginControlInterfaceGeneric VERSION 7.4.0)
6+
PROJECT(PluginControlInterfaceGeneric VERSION 8.0.0)
77

88
include(CMakeDependentOption)
99
find_package(PkgConfig)
10-
find_package(AudioManager REQUIRED > 7.3.0)
11-
find_package(AudioManagerUtilities REQUIRED > 7.3.0)
12-
10+
find_package(AudioManager REQUIRED > 7.7.1)
11+
find_package(AudioManagerUtilities REQUIRED > 7.7.1)
12+
1313
OPTION (WITH_DOCUMENTATION
1414
"build plugins with documentation" OFF )
1515
OPTION (NSM_IFACE_PRESENT
@@ -48,7 +48,12 @@ INCLUDE_DIRECTORIES(
4848

4949
LINK_DIRECTORIES(${AudioManagerUtilities_LIB_DIRECTORIES})
5050

51-
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wno-variadic-macro")
51+
# persistence data file
52+
IF(NOT DEFINED GENERIC_CONTROLLER_PERSISTENCE_FILE)
53+
SET(GENERIC_CONTROLLER_PERSISTENCE_FILE "/var/persistence/gc_persistence_data.xml")
54+
ENDIF()
55+
add_definitions(-DGENERIC_CONTROLLER_PERSISTENCE_FILE="${GENERIC_CONTROLLER_PERSISTENCE_FILE}")
56+
MESSAGE("Generic Controller persistence data file: ${GENERIC_CONTROLLER_PERSISTENCE_FILE}")
5257

5358
add_definitions(-DGENERIC_CONTROLLER_DEFAULT_CONF_ROOT="${CONF_ROOT}")
5459

‎PluginControlInterfaceGeneric/conf/audiomanagertypes.xsd‎

Lines changed: 991 additions & 968 deletions
Large diffs are not rendered by default.

‎PluginControlInterfaceGeneric/conf/configuration_async.xml‎

Lines changed: 88 additions & 381 deletions
Large diffs are not rendered by default.

‎PluginControlInterfaceGeneric/conf/configuration_test.xml‎

Lines changed: 85 additions & 303 deletions
Large diffs are not rendered by default.

‎PluginControlInterfaceGeneric/conf/customtypes.xsd‎

Lines changed: 65 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,68 @@
11
<?xml version="1.0"?>
22
<xsd:schema targetNamespace="controller" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:c="controller">
3-
<xsd:simpleType name="am_CustomAvailabilityReason_t">
4-
<xsd:annotation>
5-
<xsd:documentation>This enumeration list the source/sink availability change reason. </xsd:documentation>
6-
</xsd:annotation>
7-
<xsd:restriction base="xsd:string">
8-
</xsd:restriction>
9-
</xsd:simpleType>
10-
<xsd:simpleType name="am_CustomSoundPropertyType_t">
11-
<xsd:annotation>
12-
<xsd:documentation>This enumeration list the source and sink sound property. The sound properties of Genivi Audio manager can be extended to include project specific properties. Three sound properties like volume persistence, connection persistence and volume support are extended.</xsd:documentation>
13-
</xsd:annotation>
14-
<xsd:restriction base="xsd:string">
15-
</xsd:restriction>
16-
</xsd:simpleType>
17-
<xsd:simpleType name="am_CustomConnectionFormat_t">
18-
<xsd:annotation>
19-
<xsd:documentation>This enumeration lists the connection format for the source and sinks.</xsd:documentation>
20-
</xsd:annotation>
21-
<xsd:restriction base="xsd:string">
22-
</xsd:restriction>
23-
</xsd:simpleType>
24-
<xsd:simpleType name="am_CustomNotificationType_t">
25-
<xsd:annotation>
26-
<xsd:documentation>This enumeration contains the type of notification possible.</xsd:documentation>
27-
</xsd:annotation>
28-
<xsd:restriction base="xsd:string">
29-
</xsd:restriction>
30-
</xsd:simpleType>
31-
<xsd:simpleType name="am_CustomSystemPropertyType_t">
32-
<xsd:annotation>
33-
<xsd:documentation>This enumeration lists the system properties.</xsd:documentation>
34-
</xsd:annotation>
35-
<xsd:restriction base="xsd:string">
36-
<xsd:enumeration value="SYP_DEBUG_LOG">
37-
<xsd:annotation>
38-
<xsd:documentation>1 </xsd:documentation>
39-
</xsd:annotation>
40-
</xsd:enumeration>
41-
42-
</xsd:restriction>
43-
</xsd:simpleType>
44-
<xsd:simpleType name="am_CustomRampType_t">
45-
<xsd:restriction base="xsd:string">
46-
</xsd:restriction>
47-
</xsd:simpleType>
48-
<xsd:simpleType name="am_CustomMainSoundPropertyType_t">
49-
<xsd:annotation>
50-
<xsd:documentation>This enumeration lists the Main Properties for source and sinks.</xsd:documentation>
51-
</xsd:annotation>
52-
<xsd:restriction base="xsd:string">
53-
</xsd:restriction>
54-
</xsd:simpleType>
55-
<xsd:simpleType name="am_SourceID_e">
56-
<xsd:restriction base="xsd:string">
57-
</xsd:restriction>
58-
</xsd:simpleType>
59-
<xsd:simpleType name="am_SinkID_e">
60-
<xsd:restriction base="xsd:string">
61-
</xsd:restriction>
62-
</xsd:simpleType>
3+
<xsd:simpleType name="am_CustomAvailabilityReason_t">
4+
<xsd:annotation>
5+
<xsd:documentation>This enumeration list the source/sink availability change reason. </xsd:documentation>
6+
</xsd:annotation>
7+
<xsd:restriction base="xsd:string">
8+
</xsd:restriction>
9+
</xsd:simpleType>
10+
<xsd:simpleType name="am_CustomSoundPropertyType_t">
11+
<xsd:annotation>
12+
<xsd:documentation>This enumeration list the source and sink sound property. The sound properties of Genivi Audio manager can be extended to include project specific properties. Three sound properties like volume persistence, connection persistence and volume support are extended.</xsd:documentation>
13+
</xsd:annotation>
14+
<xsd:restriction base="xsd:string">
15+
</xsd:restriction>
16+
</xsd:simpleType>
17+
<xsd:simpleType name="am_CustomConnectionFormat_t">
18+
<xsd:annotation>
19+
<xsd:documentation>This enumeration lists the connection format for the source and sinks.</xsd:documentation>
20+
</xsd:annotation>
21+
<xsd:restriction base="xsd:string">
22+
</xsd:restriction>
23+
</xsd:simpleType>
24+
<xsd:simpleType name="am_CustomNotificationType_t">
25+
<xsd:annotation>
26+
<xsd:documentation>This enumeration contains the type of notification possible.</xsd:documentation>
27+
</xsd:annotation>
28+
<xsd:restriction base="xsd:string">
29+
</xsd:restriction>
30+
</xsd:simpleType>
31+
<xsd:simpleType name="am_CustomSystemPropertyType_t">
32+
<xsd:annotation>
33+
<xsd:documentation>This enumeration lists the system properties.</xsd:documentation>
34+
</xsd:annotation>
35+
<xsd:restriction base="xsd:string">
36+
</xsd:restriction>
37+
</xsd:simpleType>
38+
<xsd:simpleType name="am_CustomRampType_t">
39+
<xsd:restriction base="xsd:string">
40+
</xsd:restriction>
41+
</xsd:simpleType>
42+
<xsd:simpleType name="am_CustomMainSoundPropertyType_t">
43+
<xsd:annotation>
44+
<xsd:documentation>This enumeration lists the Main Properties for source and sinks.</xsd:documentation>
45+
</xsd:annotation>
46+
<xsd:restriction base="xsd:string">
47+
</xsd:restriction>
48+
</xsd:simpleType>
49+
<xsd:simpleType name="am_CustomClassPropertyType_t">
50+
<xsd:annotation>
51+
<xsd:documentation>This enumeration lists the Class Properties.</xsd:documentation>
52+
</xsd:annotation>
53+
<xsd:restriction base="xsd:string">
54+
</xsd:restriction>
55+
</xsd:simpleType>
56+
<xsd:simpleType name="am_SourceID_e">
57+
<xsd:restriction base="xsd:string">
58+
</xsd:restriction>
59+
</xsd:simpleType>
60+
<xsd:simpleType name="am_SinkID_e">
61+
<xsd:restriction base="xsd:string">
62+
</xsd:restriction>
63+
</xsd:simpleType>
64+
<xsd:simpleType name="am_ClassID_e">
65+
<xsd:restriction base="xsd:string">
66+
</xsd:restriction>
67+
</xsd:simpleType>
6368
</xsd:schema>

0 commit comments

Comments
 (0)