Removed translation library dependency for plugin

Removed translation library dependency for plugin pt2 Removed translation library dependency for plugin pt2
AMWA-TV · Dec 20, 2024 · 719d586 · 719d586
1 parent 536104a
commit 719d586
Show file tree

Hide file tree

Showing 13 changed files with 718 additions and 535 deletions.
diff --git a/cpp/demos/ossrf-nmos-api/config/nmos_config.json b/cpp/demos/ossrf-nmos-api/config/nmos_config.json
@@ -5,7 +5,7 @@
             "label": "BISECT OSSRF Node",
             "description": "BISECT OSSRF node",
             "host_addresses": [
-                "192.168.1.85"
+                "192.168.1.36"
             ],
             "interfaces": [
                 {
@@ -24,10 +24,10 @@
                     "locked": true
                 }
             ],
-            "registry_address": "192.168.1.85",
+            "registry_address": "192.168.1.36",
             "registry_version": "v1.3",
             "registration_port": 8010,
-            "system_address": "192.168.1.85",
+            "system_address": "192.168.1.36",
             "system_version": "v1.0",
             "system_port": 8010
         }
@@ -44,7 +44,7 @@
             "description": "BISECT OSSRF receiver video",
             "network": {
                 "primary": {
-                    "interface_address": "192.168.1.85",
+                    "interface_address": "192.168.1.36",
                     "interface_name": "wlp1s0"
                 }
             },
@@ -58,7 +58,7 @@
             "description": "BISECT OSSRF receiver audio",
             "network": {
                 "primary": {
-                    "interface_address": "192.168.1.85",
+                    "interface_address": "192.168.1.36",
                     "interface_name": "wlp1s0"
                 }
             },
@@ -74,9 +74,9 @@
             "description": "BISECT OSSRF sender video",
             "network": {
                 "primary": {
-                    "source_address": "192.168.1.85",
+                    "source_address": "192.168.1.36",
                     "interface_name": "wlp1s0",
-                    "destination_address": "239.10.10.10",
+                    "destination_address": "192.168.1.36",
                     "destination_port": 5004
                 }
             },
@@ -99,7 +99,7 @@
             "description": "BISECT OSSRF sender audio",
             "network": {
                 "primary": {
-                    "source_address": "192.168.1.85",
+                    "source_address": "192.168.1.36",
                     "interface_name": "wlp1s0",
                     "destination_address": "239.10.10.11",
                     "destination_port": 5005

diff --git a/cpp/demos/ossrf-nmos-api/config/nmos_plugin_config.json b/cpp/demos/ossrf-nmos-api/config/nmos_plugin_config.json
@@ -5,7 +5,7 @@
             "label": "BISECT OSSRF Node2",
             "description": "BISECT OSSRF node2",
             "host_addresses": [
-                "192.168.88.92"
+                "192.168.1.36"
             ],
             "interfaces": [
                 {
@@ -24,10 +24,10 @@
                     "locked": true
                 }
             ],
-            "registry_address": "192.168.88.92",
+            "registry_address": "192.168.1.36",
             "registry_version": "v1.3",
             "registration_port": 8010,
-            "system_address": "192.168.88.92",
+            "system_address": "192.168.1.36",
             "system_version": "v1.0",
             "system_port": 8010,
             "http_port": 5113
@@ -45,7 +45,7 @@
             "description": "BISECT OSSRF receiver video",
             "network": {
                 "primary": {
-                    "interface_address": "192.168.88.92",
+                    "interface_address": "192.168.1.36",
                     "interface_name": "wlp1s0"
                 }
             },
@@ -59,7 +59,7 @@
             "description": "BISECT OSSRF receiver audio",
             "network": {
                 "primary": {
-                    "interface_address": "192.168.88.92",
+                    "interface_address": "192.168.1.36",
                     "interface_name": "wlp1s0"
                 }
             },

diff --git a/cpp/demos/ossrf-nmos-api/config/nmos_plugin_node_config.json b/cpp/demos/ossrf-nmos-api/config/nmos_plugin_node_config.json
@@ -0,0 +1,39 @@
+{
+    "node": {
+        "id": "d5504cd1-fe68-489d-99d4-20d3f075f062",
+        "configuration": {
+            "label": "BISECT OSSRF Node2",
+            "description": "BISECT OSSRF node2",
+            "host_addresses": [
+                "192.168.1.120"
+            ],
+            "interfaces": [
+                {
+                    "chassis_id": "c8-94-02-f7-3e-eb",
+                    "name": "wlp1s0",
+                    "port_id": "00-e0-4c-68-01-8d"
+                }
+            ],
+            "clocks": [
+                {
+                    "name": "clk0",
+                    "ref_type": "ptp",
+                    "traceable": false,
+                    "version": "IEEE1588-2008",
+                    "gmid": "00-20-fc-ff-fe-35-9c-25",
+                    "locked": true
+                }
+            ],
+            "registry_address": "192.168.1.120",
+            "registry_version": "v1.3",
+            "registration_port": 8010,
+            "system_address": "192.168.1.120",
+            "system_version": "v1.0",
+            "system_port": 8010,
+            "http_port": 5113
+        }
+    },
+    "device": {},
+    "receivers": [],
+    "senders": []
+}
diff --git a/cpp/demos/ossrf-nmos-api/config/nmos_sender_config.json b/cpp/demos/ossrf-nmos-api/config/nmos_sender_config.json
@@ -4,9 +4,9 @@
             "description": "BISECT OSSRF sender video",
             "network": {
                 "primary": {
-                    "source_address": "192.168.88.92",
+                    "source_address": "192.168.1.36",
                     "interface_name": "wlp1s0",
-                    "destination_address": "192.168.88.92",
+                    "destination_address": "192.168.1.36",
                     "destination_port": 5004
                 }
             },

diff --git a/cpp/libs/CMakeLists.txt b/cpp/libs/CMakeLists.txt
@@ -4,6 +4,5 @@ add_subdirectory(bisect_sdp)
 add_subdirectory(bisect_gst)
 add_subdirectory(gst_nmos_sender_plugin)
 add_subdirectory(ossrf_nmos_api)
-add_subdirectory(ossrf_c_nmos_api)
 add_subdirectory(ossrf_gstreamer_api)
 add_subdirectory(bisect_json)
diff --git a/cpp/libs/gst_nmos_sender_plugin/CMakeLists.txt b/cpp/libs/gst_nmos_sender_plugin/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.16)
-project(gst_nmos_sender_plugin LANGUAGES C)
+project(gst_nmos_sender_plugin LANGUAGES CXX)
 
-# Define the path to the ossrf_c_nmos_api directory
-set(OSSRF_C_NMOS_API_PATH "../ossrf_c_nmos_api/")
+find_package(nlohmann_json REQUIRED)
+find_package(PkgConfig REQUIRED)
 
 # Find required GStreamer packages
 find_package(PkgConfig REQUIRED)
@@ -12,13 +12,13 @@ pkg_search_module(GSTREAMER_AUDIO REQUIRED gstreamer-audio-1.0>=1.4)
 pkg_search_module(GSTREAMER_VIDEO REQUIRED gstreamer-video-1.0>=1.4)
 
 # Include source files
-file(GLOB_RECURSE ${PROJECT_NAME}_source_files *.c *.h)
+file(GLOB_RECURSE ${PROJECT_NAME}_source_files *.cpp *.h)
 
 # Define the plugin as a shared library
 add_library(${PROJECT_NAME} MODULE ${${PROJECT_NAME}_source_files})
 
 # Include directories
-target_include_directories(${PROJECT_NAME} PRIVATE ${GSTREAMER_INCLUDE_DIRS} ${OSSRF_C_NMOS_API_PATH})
+target_include_directories(${PROJECT_NAME} PRIVATE ${GSTREAMER_INCLUDE_DIRS})
 
 # Link GStreamer libraries
 target_compile_options(${PROJECT_NAME} PRIVATE ${GSTREAMER_CFLAGS_OTHER})
@@ -27,7 +27,14 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
     ${GSTREAMER_APP_LIBRARIES} 
     ${GSTREAMER_AUDIO_LIBRARIES} 
     ${GSTREAMER_VIDEO_LIBRARIES}
-    ossrf::ossrf_c_nmos_api)
+    PUBLIC
+    bisect::project_warnings
+    bisect::expected
+    bisect::bisect_nmoscpp
+    bisect::bisect_json
+    nlohmann_json::nlohmann_json
+    ossrf::ossrf_nmos_api
+    ${GLIB_LIBRARIES})
 
 # Specify the output directory and the library name
 set_target_properties(${PROJECT_NAME} PROPERTIES
@@ -40,3 +47,5 @@ add_library(ossrf::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 # Install the plugin to the system's GStreamer plugin directory
 install(TARGETS ${PROJECT_NAME}
         LIBRARY DESTINATION ~/.local/lib/gstreamer-1.0)
+
+add_subdirectory(utils)