Rename unicens plugin as output unicens plugin

Move all files according plugin name changes.
Update cmake files.
Update unicens configuration file.

Change-Id: I468430dfbc885ec0bfa03a179a9dd4f14de3f1d0
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>

19 files changed, 70 insertions, 62 deletions

diff --git a/cfg/hal-4a-unicens-coax.json b/cfg/hal-4a-unicens-coax.json
index e6ef3ba..85fbff1 100644
--- a/cfg/hal-4a-unicens-coax.json
+++ b/cfg/hal-4a-unicens-coax.json
@@ -11,30 +11,23 @@
     },
     "resources": [
         {
-            "uid": "hal-unicens",
-            "info": "UNICENS HAL plugin",
+            "uid": "hal-unicens-output",
+            "info": "UNICENS HAL plugin for output audio",
             "spath": "./package/lib/plugins:./package/var:./lib/plugins:./var:/usr/libexec/agl/4a-hal",
-            "libs": ["hal-unicens.ctlso"]
+            "libs": ["hal-unicens-output.ctlso"]
         }
     ],
     "onload": [
         {
             "uid": "init-audio-hal",
             "info": "Init current HAL",
-            "action": "plugin://hal-unicens#Init"
-        }
-    ],
-    "controls": [
-        {
-            "uid": "ping",
-            "info": "Ping hal",
-            "action": "api://4a-hal-manager#ping"
+            "action": "plugin://hal-unicens-output#Init"
         }
     ],
     "events": [
         {
             "uid": "UNICENS/node-availibility",
-            "action": "plugin://hal-unicens#Events"
+            "action": "plugin://hal-unicens-output#Events"
         }
     ],
     "halmap": [
@@ -53,7 +46,7 @@
                     "step": 1
                 }
             },
-            "action": "plugin://hal-unicens#MasterVol"
+            "action": "plugin://hal-unicens-output#MasterVol"
         }
     ],
     "halmixer": {
diff --git a/cfg/hal-4a-unicens-utp.json b/cfg/hal-4a-unicens-utp.json
index db04b5b..0cb93d7 100644
--- a/cfg/hal-4a-unicens-utp.json
+++ b/cfg/hal-4a-unicens-utp.json
@@ -11,30 +11,23 @@
     },
     "resources": [
         {
-            "uid": "hal-unicens",
-            "info": "UNICENS HAL plugin",
+            "uid": "hal-unicens-output",
+            "info": "UNICENS HAL plugin for output audio",
             "spath": "./package/lib/plugins:./package/var:./lib/plugins:./var:/usr/libexec/agl/4a-hal",
-            "libs": ["hal-unicens.ctlso"]
+            "libs": ["hal-unicens-output.ctlso"]
         }
     ],
     "onload": [
         {
             "uid": "init-audio-hal",
             "info": "Init current HAL",
-            "action": "plugin://hal-unicens#Init"
-        }
-    ],
-    "controls": [
-        {
-            "uid": "ping",
-            "info": "Ping hal",
-            "action": "api://4a-hal-manager#ping"
+            "action": "plugin://hal-unicens-output#Init"
         }
     ],
     "events": [
         {
             "uid": "UNICENS/node-availibility",
-            "action": "plugin://hal-unicens#Events"
+            "action": "plugin://hal-unicens-output#Events"
         }
     ],
     "halmap": [
@@ -53,7 +46,7 @@
                     "step": 1
                 }
             },
-            "action": "plugin://hal-unicens#MasterVol"
+            "action": "plugin://hal-unicens-output#MasterVol"
         }
     ],
     "halmixer": {
diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
index 2672f72..3fd93ec 100644
--- a/plugin/CMakeLists.txt
+++ b/plugin/CMakeLists.txt
@@ -1,13 +1,13 @@
 ###########################################################################
-# Copyright 2015, 2016, 2017, 2018 IoT.bzh
+# Copyright 2015, 2016, 2017 IoT.bzh
 #
-# author: Jonathan Aillet <jonathan.aillet@iot.bzh>
+# author: 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
+#     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,
@@ -16,37 +16,7 @@
 # limitations under the License.
 ###########################################################################
 
-ADD_SUBDIRECTORY(ucs2-vol)
 
-PROJECT_TARGET_ADD(hal-unicens)
-
-		# Define targets
-		ADD_LIBRARY(${TARGET_NAME} MODULE
-			    most_unicens.c
-			    wrap_unicens.c
-			    wrap_volume.c
-			    )
-
-		# Alsa Plugin properties
-		SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-			LABELS "PLUGIN"
-			PREFIX ""
-			SUFFIX ".ctlso"
-			OUTPUT_NAME ${TARGET_NAME}
-		)
-
-		# Library dependencies (include updates automatically)
-		TARGET_LINK_LIBRARIES(${TARGET_NAME}
-			afb-helpers
-			ctl-utilities
-			ucs2-volume
-			${link_libraries}
-		)
-
-		target_include_directories(${TARGET_NAME}
-			PRIVATE "${CMAKE_SOURCE_DIR}/app-controller/ctl-lib"
-			#PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-controllers"
-			#PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-manager"
-			#PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-utilities"
-			PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ucs2-vol/inc"
-		)
+# Include any directory not starting with _
+# -----------------------------------------------------
+PROJECT_SUBDIRS_ADD()
diff --git a/plugin/unicens-output/CMakeLists.txt b/plugin/unicens-output/CMakeLists.txt
new file mode 100644
index 0000000..b6e9977
--- /dev/null
+++ b/plugin/unicens-output/CMakeLists.txt
@@ -0,0 +1,52 @@
+###########################################################################
+# Copyright 2015, 2016, 2017, 2018 IoT.bzh
+#
+# author: Jonathan Aillet <jonathan.aillet@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.
+###########################################################################
+
+ADD_SUBDIRECTORY(ucs2-vol)
+
+PROJECT_TARGET_ADD(hal-unicens-output)
+
+		# Define targets
+		ADD_LIBRARY(${TARGET_NAME} MODULE
+			    most_unicens.c
+			    wrap_unicens.c
+			    wrap_volume.c
+			    )
+
+		# Alsa Plugin properties
+		SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
+			LABELS "PLUGIN"
+			PREFIX ""
+			SUFFIX ".ctlso"
+			OUTPUT_NAME ${TARGET_NAME}
+		)
+
+		# Library dependencies (include updates automatically)
+		TARGET_LINK_LIBRARIES(${TARGET_NAME}
+			afb-helpers
+			ctl-utilities
+			ucs2-volume
+			${link_libraries}
+		)
+
+		target_include_directories(${TARGET_NAME}
+			PRIVATE "${CMAKE_SOURCE_DIR}/app-controller/ctl-lib"
+			#PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-controllers"
+			#PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-manager"
+			#PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-utilities"
+			PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ucs2-vol/inc"
+		)
diff --git a/plugin/most_unicens.c b/plugin/unicens-output/most_unicens.c
index a0d040b..a0d040b 100644
--- a/plugin/most_unicens.c
+++ b/plugin/unicens-output/most_unicens.c
diff --git a/plugin/ucs2-vol/CMakeLists.txt b/plugin/unicens-output/ucs2-vol/CMakeLists.txt
index c734639..c734639 100644
--- a/plugin/ucs2-vol/CMakeLists.txt
+++ b/plugin/unicens-output/ucs2-vol/CMakeLists.txt
diff --git a/plugin/ucs2-vol/inc/device_container.h b/plugin/unicens-output/ucs2-vol/inc/device_container.h
index 9fabdb5..9fabdb5 100644
--- a/plugin/ucs2-vol/inc/device_container.h
+++ b/plugin/unicens-output/ucs2-vol/inc/device_container.h
diff --git a/plugin/ucs2-vol/inc/device_value.h b/plugin/unicens-output/ucs2-vol/inc/device_value.h
index ef57003..ef57003 100644
--- a/plugin/ucs2-vol/inc/device_value.h
+++ b/plugin/unicens-output/ucs2-vol/inc/device_value.h
diff --git a/plugin/ucs2-vol/inc/libmostvolume.h b/plugin/unicens-output/ucs2-vol/inc/libmostvolume.h
index 5335754..5335754 100644
--- a/plugin/ucs2-vol/inc/libmostvolume.h
+++ b/plugin/unicens-output/ucs2-vol/inc/libmostvolume.h
diff --git a/plugin/ucs2-vol/inc/setup.h b/plugin/unicens-output/ucs2-vol/inc/setup.h
index 3be8bf4..3be8bf4 100644
--- a/plugin/ucs2-vol/inc/setup.h
+++ b/plugin/unicens-output/ucs2-vol/inc/setup.h
diff --git a/plugin/ucs2-vol/src/CMakeLists.txt b/plugin/unicens-output/ucs2-vol/src/CMakeLists.txt
index 1be7184..1be7184 100644
--- a/plugin/ucs2-vol/src/CMakeLists.txt
+++ b/plugin/unicens-output/ucs2-vol/src/CMakeLists.txt
diff --git a/plugin/ucs2-vol/src/device_container.cpp b/plugin/unicens-output/ucs2-vol/src/device_container.cpp
index f804a42..f804a42 100644
--- a/plugin/ucs2-vol/src/device_container.cpp
+++ b/plugin/unicens-output/ucs2-vol/src/device_container.cpp
diff --git a/plugin/ucs2-vol/src/device_value.cpp b/plugin/unicens-output/ucs2-vol/src/device_value.cpp
index 4031778..4031778 100644
--- a/plugin/ucs2-vol/src/device_value.cpp
+++ b/plugin/unicens-output/ucs2-vol/src/device_value.cpp
diff --git a/plugin/ucs2-vol/src/libmostvolume.cpp b/plugin/unicens-output/ucs2-vol/src/libmostvolume.cpp
index 519e2cf..519e2cf 100644
--- a/plugin/ucs2-vol/src/libmostvolume.cpp
+++ b/plugin/unicens-output/ucs2-vol/src/libmostvolume.cpp
diff --git a/plugin/ucs2-vol/src/setup.cpp b/plugin/unicens-output/ucs2-vol/src/setup.cpp
index ad841ab..ad841ab 100644
--- a/plugin/ucs2-vol/src/setup.cpp
+++ b/plugin/unicens-output/ucs2-vol/src/setup.cpp
diff --git a/plugin/wrap_unicens.c b/plugin/unicens-output/wrap_unicens.c
index 382eea7..382eea7 100644
--- a/plugin/wrap_unicens.c
+++ b/plugin/unicens-output/wrap_unicens.c
diff --git a/plugin/wrap_unicens.h b/plugin/unicens-output/wrap_unicens.h
index 6199476..6199476 100644
--- a/plugin/wrap_unicens.h
+++ b/plugin/unicens-output/wrap_unicens.h
diff --git a/plugin/wrap_volume.c b/plugin/unicens-output/wrap_volume.c
index 9c3d7a1..9c3d7a1 100644
--- a/plugin/wrap_volume.c
+++ b/plugin/unicens-output/wrap_volume.c
diff --git a/plugin/wrap_volume.h b/plugin/unicens-output/wrap_volume.h
index 7cdcd93..7cdcd93 100644
--- a/plugin/wrap_volume.h
+++ b/plugin/unicens-output/wrap_volume.h