Skip to content

Commit cfd9297

Browse files
committed
Merge branch 'release/1.4.15'
2 parents 1e95563 + 5fe8e2f commit cfd9297

File tree

13 files changed

+1977
-2656
lines changed

13 files changed

+1977
-2656
lines changed

AVInput/AVInput.conf.in

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,3 @@ precondition = ["Platform"]
22
callsign = "org.rdk.AVInput"
33
autostart = "false"
44
startuporder = "@PLUGIN_AVINPUT_STARTUPORDER@"
5-
6-
configuration = JSON()
7-
rootobject = JSON()
8-
9-
rootobject.add("mode", "@PLUGIN_AVINPUT_MODE@")
10-
rootobject.add("locator", "lib@[email protected]")
11-
12-
configuration.add("root", rootobject)

AVInput/AVInput.config

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
set (autostart false)
22
set (preconditions Platform)
3-
set (callsign "org.rdk.AVInput")
3+
set (callsign org.rdk.AVInput)
44

55
if(PLUGIN_AVINPUT_STARTUPORDER)
66
set (startuporder ${PLUGIN_AVINPUT_STARTUPORDER})
77
endif()
8-
9-
map()
10-
key(root)
11-
map()
12-
kv(mode ${PLUGIN_AVINPUT_MODE})
13-
kv(locator lib${PLUGIN_IMPLEMENTATION}.so)
14-
end()
15-
end()
16-
ans(configuration)

0 commit comments

Comments
 (0)