Skip to content

Commit

Permalink
Merge pull request #16 from GENIVI/GC_reworked_controller
Browse files Browse the repository at this point in the history 
GC: Introduce new version of generic controller plugin
  • Loading branch information
Martin Koch authored Mar 18, 2020
2 parents b5090c9 + 44502f4 commit e7dd15b
Show file tree
Hide file tree
Showing 177 changed files with 29,605 additions and 20,266 deletions.
15 changes: 10 additions & 5 deletions PluginControlInterfaceGeneric/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
INCLUDE(CMakeDependentOption)
FIND_PACKAGE(PkgConfig)

PROJECT(PluginControlInterfaceGeneric VERSION 7.4.0)
PROJECT(PluginControlInterfaceGeneric VERSION 8.0.0)

include(CMakeDependentOption)
find_package(PkgConfig)
find_package(AudioManager REQUIRED > 7.3.0)
find_package(AudioManagerUtilities REQUIRED > 7.3.0)
find_package(AudioManager REQUIRED > 7.7.1)
find_package(AudioManagerUtilities REQUIRED > 7.7.1)

OPTION (WITH_DOCUMENTATION
"build plugins with documentation" OFF )
OPTION (NSM_IFACE_PRESENT
Expand Down Expand Up @@ -48,7 +48,12 @@ INCLUDE_DIRECTORIES(

LINK_DIRECTORIES(${AudioManagerUtilities_LIB_DIRECTORIES})

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

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

Expand Down
1,959 changes: 991 additions & 968 deletions PluginControlInterfaceGeneric/conf/audiomanagertypes.xsd
View file

Large diffs are not rendered by default.

469 changes: 88 additions & 381 deletions PluginControlInterfaceGeneric/conf/configuration_async.xml
View file

Large diffs are not rendered by default.

388 changes: 85 additions & 303 deletions PluginControlInterfaceGeneric/conf/configuration_test.xml
View file

Large diffs are not rendered by default.

125 changes: 65 additions & 60 deletions PluginControlInterfaceGeneric/conf/customtypes.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,63 +1,68 @@
<?xml version="1.0"?>
<xsd:schema targetNamespace="controller" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:c="controller">
<xsd:simpleType name="am_CustomAvailabilityReason_t">
<xsd:annotation>
<xsd:documentation>This enumeration list the source/sink availability change reason. </xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomSoundPropertyType_t">
<xsd:annotation>
<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>
</xsd:annotation>
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomConnectionFormat_t">
<xsd:annotation>
<xsd:documentation>This enumeration lists the connection format for the source and sinks.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomNotificationType_t">
<xsd:annotation>
<xsd:documentation>This enumeration contains the type of notification possible.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomSystemPropertyType_t">
<xsd:annotation>
<xsd:documentation>This enumeration lists the system properties.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
<xsd:enumeration value="SYP_DEBUG_LOG">
<xsd:annotation>
<xsd:documentation>1 </xsd:documentation>
</xsd:annotation>
</xsd:enumeration>

</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomRampType_t">
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomMainSoundPropertyType_t">
<xsd:annotation>
<xsd:documentation>This enumeration lists the Main Properties for source and sinks.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_SourceID_e">
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_SinkID_e">
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomAvailabilityReason_t">
<xsd:annotation>
<xsd:documentation>This enumeration list the source/sink availability change reason. </xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomSoundPropertyType_t">
<xsd:annotation>
<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>
</xsd:annotation>
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomConnectionFormat_t">
<xsd:annotation>
<xsd:documentation>This enumeration lists the connection format for the source and sinks.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomNotificationType_t">
<xsd:annotation>
<xsd:documentation>This enumeration contains the type of notification possible.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomSystemPropertyType_t">
<xsd:annotation>
<xsd:documentation>This enumeration lists the system properties.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomRampType_t">
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomMainSoundPropertyType_t">
<xsd:annotation>
<xsd:documentation>This enumeration lists the Main Properties for source and sinks.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_CustomClassPropertyType_t">
<xsd:annotation>
<xsd:documentation>This enumeration lists the Class Properties.</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_SourceID_e">
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_SinkID_e">
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="am_ClassID_e">
<xsd:restriction base="xsd:string">
</xsd:restriction>
</xsd:simpleType>
</xsd:schema>
Loading

0 comments on commit e7dd15b

Please sign in to comment.