Resolve merge conflicts

Signed-off-by: Adriaan Niess <[email protected]>

CMakeLists.txt

@@ -12,9 +12,6 @@ set(LIBRARY_OUTPUT_PATH "${PROJECT_BINARY_DIR}/lib")
 
 # PDU parsing library
 add_library(open1722pdu SHARED 
-    "src/avtp_ieciidc.c"
-    "src/avtp_stream.c"
-    "src/avtp.c"
     "src/avtp/CommonHeader.c"
     "src/avtp/Crf.c"
     "src/avtp/Rvf.c"
@@ -101,20 +98,6 @@ target_include_directories(cvf-listener PRIVATE
     "${PROJECT_BINARY_DIR}/include")
 target_link_libraries(cvf-listener open1722pdu open1722examples)
 
-# IEC 61883/IIDC talker app
-add_executable(ieciidc-talker "examples/ieciidc/ieciidc-talker.c")
-target_include_directories(ieciidc-talker PRIVATE
-    "${PROJECT_BINARY_DIR}/examples"
-    "${PROJECT_BINARY_DIR}/include")
-target_link_libraries(ieciidc-talker open1722pdu open1722examples)
-
-# IEC 61883/IIDC listener app
-add_executable(ieciidc-listener "examples/ieciidc/ieciidc-listener.c")
-target_include_directories(ieciidc-listener PRIVATE
-    "${PROJECT_BINARY_DIR}/examples"
-    "${PROJECT_BINARY_DIR}/include")
-target_link_libraries(ieciidc-listener open1722pdu open1722examples)
-
 #### Tests ####################################################################
 
 enable_testing()
@@ -126,7 +109,6 @@ list(APPEND TEST_TARGETS test-avtp)
 list(APPEND TEST_TARGETS test-can)
 list(APPEND TEST_TARGETS test-crf)
 list(APPEND TEST_TARGETS test-cvf)
-list(APPEND TEST_TARGETS test-ieciidc)
 list(APPEND TEST_TARGETS test-rvf)
 # list(APPEND TEST_TARGETS test-stream)
 
@@ -149,8 +131,6 @@ install(TARGETS
     crf-talker
     cvf-listener
     cvf-talker
-    ieciidc-listener
-    ieciidc-talker
     DESTINATION bin)
 install(DIRECTORY include/ DESTINATION include)
 

examples/aaf/aaf-listener.c

@@ -69,7 +69,6 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include "avtp.h"
 #include "avtp/aaf/PcmStream.h"
 #include "common/common.h"
 #include "avtp/CommonHeader.h"

examples/aaf/aaf-talker.c

@@ -64,7 +64,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "avtp.h"
 #include "avtp/aaf/PcmStream.h"
 #include "common/common.h"
 #include "avtp/CommonHeader.h"

examples/crf/crf-listener.c

@@ -99,7 +99,6 @@
 #include <math.h>
 #include <inttypes.h>
 
-#include "avtp.h"
 #include "avtp/Crf.h"
 #include "avtp/aaf/PcmStream.h"
 #include "common/common.h"

examples/crf/crf-talker.c

@@ -62,7 +62,6 @@
 #include <unistd.h>
 #include <math.h>
 
-#include "avtp.h"
 #include "avtp/Crf.h"
 #include "common/common.h"
 #include "avtp/CommonHeader.h"

examples/cvf/cvf-listener.c

@@ -72,7 +72,6 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include "avtp.h"
 #include "avtp/cvf/Cvf.h"
 #include "avtp/cvf/H264.h"
 #include "avtp/CommonHeader.h"

examples/cvf/cvf-talker.c

@@ -75,7 +75,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "avtp.h"
 #include "avtp/cvf/Cvf.h"
 #include "avtp/cvf/H264.h"
 #include "common/common.h"