diff options
author | Veeresh Kadasani <external.vkadasani@jp.adit-jv.com> | 2019-09-26 15:15:40 +0900 |
---|---|---|
committer | Veeresh Kadasani <external.vkadasani@jp.adit-jv.com> | 2019-09-26 15:16:44 +0900 |
commit | 2309102f95145d04dad67bf4d00e4c217aea8470 (patch) | |
tree | 3eb87ba9e5375e0e3e1b793240608c156c2664f5 | |
parent | b880c4be2c645a95794a30742067e5841c3c7feb (diff) |
change output section name for transmitterhalibut_8.0.2halibut/8.0.28.0.2
remoting-plugin and transmitter-plugin use same
output section name [remote-output] so change it
to [transmitter-output] for transmitter-plugin to
avoid conflict.
Change-Id: Ib15071ceb68e26e9343765ffcd66988b5a1d4acc
Signed-off-by: Veeresh Kadasani <external.vkadasani@jp.adit-jv.com>
-rw-r--r-- | waltham-receiver/README.md | 2 | ||||
-rw-r--r-- | waltham-transmitter/README.md | 4 | ||||
-rw-r--r-- | waltham-transmitter/transmitter-plugin/plugin.c | 2 | ||||
-rw-r--r-- | waltham-transmitter/transmitter-plugin/weston.ini.transmitter | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/waltham-receiver/README.md b/waltham-receiver/README.md index d0f63cb..93de6d8 100644 --- a/waltham-receiver/README.md +++ b/waltham-receiver/README.md @@ -84,7 +84,7 @@ Rename file as "pipeline_receiver.cfg" and put in correct place when you use the $ping 192.168.2.52 (you can also ping vice versa) -3. Make sure that IP address specified in the weston.ini under [remote-output] matches the Waltham-Receiver IP. +3. Make sure that IP address specified in the weston.ini under [transmitter-output] matches the Waltham-Receiver IP. 4. Make sure that IP address in pipeline.cfg on the transmitter side match the Waltham-Receiver IP. diff --git a/waltham-transmitter/README.md b/waltham-transmitter/README.md index b358cfd..15cafe4 100644 --- a/waltham-transmitter/README.md +++ b/waltham-transmitter/README.md @@ -72,7 +72,7 @@ Waltham Transmitter is divide in to two component: The destination of remoting is configured in weston.ini. Add output name, server address, port number, output's width and height key - under '[remote-output]'. You can speficy multiple [remote-output]. + under '[transmitter-output]'. You can speficy multiple [transmitter-output]. In details, see 'weston.ini.transmitter'. @@ -99,7 +99,7 @@ Waltham Transmitter is divide in to two component: $ping 192.168.2.52 (you can also ping vice versa) -3. Make sure that IP address specified in the weston.ini under [remote-output] matches the Waltham-Receiver IP. +3. Make sure that IP address specified in the weston.ini under [transmitter-output] matches the Waltham-Receiver IP. 4. Make sure that IP address in pipeline.cfg on the transmitter side match the Waltham-Receiver IP. diff --git a/waltham-transmitter/transmitter-plugin/plugin.c b/waltham-transmitter/transmitter-plugin/plugin.c index 66c115f..65ebdf6 100644 --- a/waltham-transmitter/transmitter-plugin/plugin.c +++ b/waltham-transmitter/transmitter-plugin/plugin.c @@ -861,7 +861,7 @@ transmitter_get_server_config(struct weston_transmitter *txr) section = weston_config_get_section(config, "remote", NULL, NULL); while (weston_config_next_section(config, §ion, &name)) { - if (0 == strcmp(name, "remote-output")) { + if (0 == strcmp(name, "transmitter-output")) { if (0 != weston_config_section_get_string(section, "output-name", &model, 0)) continue; diff --git a/waltham-transmitter/transmitter-plugin/weston.ini.transmitter b/waltham-transmitter/transmitter-plugin/weston.ini.transmitter index 1aff0b2..0c31258 100644 --- a/waltham-transmitter/transmitter-plugin/weston.ini.transmitter +++ b/waltham-transmitter/transmitter-plugin/weston.ini.transmitter @@ -6,14 +6,14 @@ modules=transmitter.so ivi-module=ivi-controller.so ivi-input-module=ivi-input-controller.so -[remote-output] +[transmitter-output] output-name=transmitter_1 server-address=192.168.2.11 port=34400 width=1920 height=1080 -[remote-output] +[transmitter-output] output-name=transmitter_2 server-address=192.168.2.12 port=34400 |