Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
engine-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AURA
engine-core
Commits
6af1c059
Verified
Commit
6af1c059
authored
1 year ago
by
Ole Binder
Browse files
Options
Downloads
Patches
Plain Diff
Fix: map in- and output ports
parent
43cc7bc6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!8
Feat jack support
Pipeline
#7170
passed
1 year ago
Stage: release
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docker-compose.yaml
+6
-1
6 additions, 1 deletion
docker-compose.yaml
sample.env
+4
-0
4 additions, 0 deletions
sample.env
scripts/wireplumber/auto-connect-ports.lua
+14
-12
14 additions, 12 deletions
scripts/wireplumber/auto-connect-ports.lua
with
24 additions
and
13 deletions
docker-compose.yaml
+
6
−
1
View file @
6af1c059
...
...
@@ -19,7 +19,11 @@ services:
AURA_ENGINE_RUN_AS_ROOT
:
false
# Audio Device Settings
AURA_ENGINE_OUTPUT_DEVICE
:
${AURA_ENGINE_OUTPUT_DEVICE}
AURA_ENGINE_OUTPUT_CHANNEL_LEFT
:
${AURA_ENGINE_OUTPUT_CHANNEL_LEFT}
AURA_ENGINE_OUTPUT_CHANNEL_RIGHT
:
${AURA_ENGINE_OUTPUT_CHANNEL_RIGHT}
AURA_ENGINE_INPUT_DEVICE
:
${AURA_ENGINE_INPUT_DEVICE}
AURA_ENGINE_INPUT_CHANNEL_LEFT
:
${AURA_ENGINE_INPUT_CHANNEL_LEFT}
AURA_ENGINE_INPUT_CHANNEL_RIGHT
:
${AURA_ENGINE_INPUT_CHANNEL_RIGHT}
# Fallback Settings
AURA_ENGINE_FALLBACK_SHOW_NAME
:
${AURA_ENGINE_FALLBACK_SHOW_NAME}
AURA_ENGINE_FALLBACK_SHOW_ID
:
${AURA_ENGINE_FALLBACK_SHOW_ID}
...
...
@@ -56,7 +60,8 @@ services:
AURA_ENGINE_STREAM_OUTPUT_DESCRIPTION
:
${AURA_ENGINE_STREAM_OUTPUT_DESCRIPTION}
AURA_ENGINE_STREAM_OUTPUT_GENRE
:
${AURA_ENGINE_STREAM_OUTPUT_GENRE}
volumes
:
-
/run/user/2872/pipewire-0:/tmp/pipewire-0
# this needs to be the path of the user running pipewire, most likely the current user
-
/run/user/1000/pipewire-0:/tmp/pipewire-0
-
./../services/:/etc/aura/:ro
# - ./asound.conf:/etc/asound.conf
-
${AURA_AUDIO_STORE_SOURCE}:/var/audio/source
...
...
This diff is collapsed.
Click to expand it.
sample.env
+
4
−
0
View file @
6af1c059
...
...
@@ -21,7 +21,11 @@ AURA_AUDIO_STORE_FALLBACK=audio/fallback
# Audio Device Settings
AURA_ENGINE_OUTPUT_DEVICE=default
AURA_ENGINE_OUTPUT_CHANNEL_LEFT=AUX0
AURA_ENGINE_OUTPUT_CHANNEL_RIGHT=AUX1
AURA_ENGINE_INPUT_DEVICE=default
AURA_ENGINE_INPUT_CHANNEL_LEFT=AUX0
AURA_ENGINE_INPUT_CHANNEL_RIGHT=AUX1
# Fallback Settings
AURA_ENGINE_FALLBACK_SHOW_NAME=Station Fallback
AURA_ENGINE_FALLBACK_SHOW_ID=-1
...
...
This diff is collapsed.
Click to expand it.
scripts/wireplumber/auto-connect-ports.lua
+
14
−
12
View file @
6af1c059
...
...
@@ -169,25 +169,27 @@ end
--
-- Auto connect Yamaha sink to the first two channels of the Yamaha
local
audio_source_input
=
os.getenv
(
"AUDIO_SOURCE_INPUT"
)
local
audio_source_output
=
os.getenv
(
"AUDIO_SOURCE_OUTPUT"
)
local
audio_channel_left
=
os.getenv
(
"AUDIO_CHANNEL_LEFT"
)
local
audio_channel_right
=
os.getenv
(
"AUDIO_CHANNEL_RIGHT"
)
print
(
string.format
(
"%s_*"
,
audio_source_input
))
local
audio_source_input
=
os.getenv
(
"AURA_ENGINE_INPUT_DEVICE"
)
local
audio_input_channel_left
=
os.getenv
(
"AURA_ENGINE_INPUT_CHANNEL_LEFT"
)
local
audio_input_channel_right
=
os.getenv
(
"AURA_ENGINE_INPUT_CHANNEL_RIGHT"
)
local
audio_source_output
=
os.getenv
(
"AURA_ENGINE_OUTPUT_DEVICE"
)
local
audio_output_channel_left
=
os.getenv
(
"AURA_ENGINE_OUTPUT_CHANNEL_LEFT"
)
local
audio_output_channel_right
=
os.getenv
(
"AURA_ENGINE_OUTPUT_CHANNEL_RIGHT"
)
-- print(string.format("%s_*", audio_source_input))
auto_connect_ports
{
output
=
Constraint
{
"port.alias"
,
"matches"
,
audio_source_output
..
"_*"
},
input
=
Constraint
{
"port.alias"
,
"matches"
,
"
lq_in
:*"
},
input
=
Constraint
{
"port.alias"
,
"matches"
,
"
in_line_0
:*"
},
connect
=
{
[
audio_channel_left
]
=
"in_0"
,
[
audio_channel_right
]
=
"in_1"
[
audio_
input_
channel_left
]
=
"in_0"
,
[
audio_
input_
channel_right
]
=
"in_1"
}
}
auto_connect_ports
{
output
=
Constraint
{
"port.alias"
,
"matches"
,
"l
q_
out:*"
},
output
=
Constraint
{
"port.alias"
,
"matches"
,
"l
ine
out
_0
:*"
},
input
=
Constraint
{
"port.alias"
,
"matches"
,
audio_source_input
..
"_*"
},
connect
=
{
[
"out_0"
]
=
audio_channel_left
,
[
"out_1"
]
=
audio_channel_right
[
"out_0"
]
=
audio_
output_
channel_left
,
[
"out_1"
]
=
audio_
output_
channel_right
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment