summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevaev Maxim <[email protected]>2018-12-08 22:09:05 +0300
committerDevaev Maxim <[email protected]>2018-12-08 22:09:05 +0300
commit197e7cad6a835ebd8bf899ec3abd714f9a0774fb (patch)
tree123b074d4bfd3db48daca141a10588dbbafa01da
parent8229363ff6e2f2cbd21652fb02085c58cb190bb5 (diff)
kvmd-streamer -> kvmd-video
-rw-r--r--Makefile2
-rw-r--r--configs/kvmd/platforms/kvmd.v1-hdmi.yaml2
-rw-r--r--configs/kvmd/platforms/kvmd.v1-vga.yaml2
-rw-r--r--configs/systemd/kvmd-tc358743.service2
-rw-r--r--testenv/kvmd.yaml2
5 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index c9391736..1fc418d9 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ TESTENV_CMD ?= /bin/bash -c " \
&& cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
&& cp /testenv/kvmd.yaml /etc/kvmd \
&& nginx -c /etc/nginx/nginx.conf \
- && ln -s $(TESTENV_VIDEO) /dev/kvmd-streamer \
+ && ln -s $(TESTENV_VIDEO) /dev/kvmd-video \
&& (losetup -d /dev/kvmd-msd || true) \
&& losetup /dev/kvmd-msd /root/loop.img \
&& python -m kvmd.apps.kvmd -c /etc/kvmd/kvmd.yaml \
diff --git a/configs/kvmd/platforms/kvmd.v1-hdmi.yaml b/configs/kvmd/platforms/kvmd.v1-hdmi.yaml
index e62790d1..8a1f9c8b 100644
--- a/configs/kvmd/platforms/kvmd.v1-hdmi.yaml
+++ b/configs/kvmd/platforms/kvmd.v1-hdmi.yaml
@@ -61,7 +61,7 @@ kvmd:
cmd:
- "/usr/bin/ustreamer"
- - "--device=/dev/kvmd-streamer"
+ - "--device=/dev/kvmd-video"
- "--device-persistent"
- "--format=uyvy"
- "--encoder=omx"
diff --git a/configs/kvmd/platforms/kvmd.v1-vga.yaml b/configs/kvmd/platforms/kvmd.v1-vga.yaml
index 42baee7a..05c1234d 100644
--- a/configs/kvmd/platforms/kvmd.v1-vga.yaml
+++ b/configs/kvmd/platforms/kvmd.v1-vga.yaml
@@ -61,7 +61,7 @@ kvmd:
cmd:
- "/usr/bin/ustreamer"
- - "--device=/dev/kvmd-streamer"
+ - "--device=/dev/kvmd-video"
- "--tv-standard=pal"
- "--format=yuyv"
- "--encoder=cpu"
diff --git a/configs/systemd/kvmd-tc358743.service b/configs/systemd/kvmd-tc358743.service
index d1b89862..44d26d1a 100644
--- a/configs/systemd/kvmd-tc358743.service
+++ b/configs/systemd/kvmd-tc358743.service
@@ -5,7 +5,7 @@ Before=kvmd.service
[Service]
Type=oneshot
-ExecStart=/usr/bin/v4l2-ctl --device=/dev/kvmd-streamer --set-edid=file=/etc/kvmd/tc358743-edid.hex --fix-edid-checksums
+ExecStart=/usr/bin/v4l2-ctl --device=/dev/kvmd-video --set-edid=file=/etc/kvmd/tc358743-edid.hex --fix-edid-checksums
ExecStop=/bin/true
RemainAfterExit=true
diff --git a/testenv/kvmd.yaml b/testenv/kvmd.yaml
index 68035bd2..da79a736 100644
--- a/testenv/kvmd.yaml
+++ b/testenv/kvmd.yaml
@@ -58,7 +58,7 @@ kvmd:
cmd:
- "/usr/bin/ustreamer"
- - "--device=/dev/kvmd-streamer"
+ - "--device=/dev/kvmd-video"
- "--quality={quality}"
- "--desired-fps={desired_fps}"
- "--width=800"