From f22b3748b548e93f43440b5ab30c0f05b3e2b2e8 Mon Sep 17 00:00:00 2001 From: telecaster Date: Tue, 25 Mar 2025 08:42:25 +0100 Subject: [PATCH] fix pipewire targets, cleanup --- bin/streaming/telecaster.sh | 14 +++++++------- etc/telecaster/telecaster.yml | 19 ++++++++++++++++--- home/.fluxbox/init | 0 home/.fluxbox/startup | 0 4 files changed, 23 insertions(+), 10 deletions(-) mode change 100644 => 100755 home/.fluxbox/init mode change 100644 => 100755 home/.fluxbox/startup diff --git a/bin/streaming/telecaster.sh b/bin/streaming/telecaster.sh index 7360219..d7d804e 100755 --- a/bin/streaming/telecaster.sh +++ b/bin/streaming/telecaster.sh @@ -17,10 +17,10 @@ konsole & # qjackctl & sleep 1 /srv/telecaster/telecaster-server/bin/streaming/telecaster.py /etc/telecaster/telecaster.yml & - sleep 3 # JACK ports setup +# # 1: L # 2: R @@ -33,12 +33,12 @@ sleep 3 #jack_connect system:capture_1 gst-launch-1.0:in_jackaudiosrc0_1 #jack_connect system:capture_2 gst-launch-1.0:in_jackaudiosrc0_2 -jack_connect system:capture_1 gst-launch-1.0:in_jackaudiosrc0_1 -jack_connect system:capture_2 gst-launch-1.0:in_jackaudiosrc0_2 +#jack_connect system:capture_1 gst-launch-1.0:in_jackaudiosrc0_1 +#jack_connect system:capture_2 gst-launch-1.0:in_jackaudiosrc0_2 -jack_connect system:capture_1 gst-launch-1.0-01:in_jackaudiosrc0_1 -jack_connect system:capture_2 gst-launch-1.0-01:in_jackaudiosrc0_2 +#jack_connect system:capture_1 gst-launch-1.0-01:in_jackaudiosrc0_1 +#jack_connect system:capture_2 gst-launch-1.0-01:in_jackaudiosrc0_2 -jack_connect system:capture_1 gst-launch-1.0-02:in_jackaudiosrc0_1 -jack_connect system:capture_2 gst-launch-1.0-02:in_jackaudiosrc0_2 +#jack_connect system:capture_1 gst-launch-1.0-02:in_jackaudiosrc0_1 +#jack_connect system:capture_2 gst-launch-1.0-02:in_jackaudiosrc0_2 diff --git a/etc/telecaster/telecaster.yml b/etc/telecaster/telecaster.yml index ac99a64..69dc9c1 100644 --- a/etc/telecaster/telecaster.yml +++ b/etc/telecaster/telecaster.yml @@ -8,9 +8,9 @@ telecaster: video: gstreamer: - id: 0 - video_source: pipewiresrc - video_options: client-name="video_streaming" target-object="telecaster_source" name: JVC + video_source: pipewiresrc + video_options: target-object=v4l2:/dev/video0 width: 1280 height: 720 framerate: 30 @@ -27,6 +27,19 @@ telecaster: focus_automatic_continuous: 0 sharpness: 6 saturation: 100 + - id: 2 + name: USB-HDMI + video_source: pipewiresrc + video_options: target-object=v4l2:/dev/video2 + width: 1280 + height: 720 + framerate: 30 + flip: none + format: image/jpeg + decoder: jpegdec + audio_delay: 0 + video_delay: 0 + vp8_bitrate: 4000000 deefuzzer: log: /var/log/telecaster/telecaster_webm_monitor.log m3u: /tmp/telecaster_webm_monitor.m3u @@ -78,7 +91,7 @@ telecaster: audio: gstreamer: audio_source: pipewiresrc - audio_options: client-name="audio_streaming" target-object="telecaster_source" + audio_options: target-object=alsa:acp:ArturiaMsd:0:capture channels: 2 opus_bitrate: 96000 mp3_quality: 4.0 diff --git a/home/.fluxbox/init b/home/.fluxbox/init old mode 100644 new mode 100755 diff --git a/home/.fluxbox/startup b/home/.fluxbox/startup old mode 100644 new mode 100755 -- 2.39.5