Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
flow3r firmware
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
flow3r
flow3r firmware
Commits
18a20b5d
Commit
18a20b5d
authored
1 year ago
by
ave
Committed by
q3k
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
audio passthrough: fix forcing line in when trrs and line in are plugged in
parent
a36b46ba
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!208
audio passthrough: fix forcing line in when trrs and line in are plugged in
Pipeline
#7226
passed
1 year ago
Stage: check
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
python_payload/apps/audio_passthrough/__init__.py
+4
-2
4 additions, 2 deletions
python_payload/apps/audio_passthrough/__init__.py
python_payload/apps/audio_passthrough/flow3r.toml
+1
-1
1 addition, 1 deletion
python_payload/apps/audio_passthrough/flow3r.toml
with
5 additions
and
3 deletions
python_payload/apps/audio_passthrough/__init__.py
+
4
−
2
View file @
18a20b5d
...
...
@@ -108,10 +108,12 @@ class AudioPassthrough(Application):
headset_connected
=
audio
.
headset_is_connected
()
if
self
.
_force_mode
==
"
FORCE_MIC
"
:
audio
.
input_set_source
(
audio
.
INPUT_SOURCE_ONBOARD_MIC
)
elif
(
audio
.
line_in_is_connected
()
and
self
.
_force_mode
==
"
AUTO
"
)
or
self
.
_force_mode
==
"
FORCE_LINE_IN
"
:
audio
.
input_set_source
(
audio
.
INPUT_SOURCE_LINE_IN
)
elif
headset_connected
or
self
.
_force_mode
==
"
FORCE_LINE_OUT
"
:
audio
.
input_set_source
(
audio
.
INPUT_SOURCE_HEADSET_MIC
)
elif
audio
.
line_in_is_connected
()
or
self
.
_force_mode
==
"
FORCE_LINE_IN
"
:
audio
.
input_set_source
(
audio
.
INPUT_SOURCE_LINE_IN
)
else
:
audio
.
input_set_source
(
audio
.
INPUT_SOURCE_NONE
)
...
...
This diff is collapsed.
Click to expand it.
python_payload/apps/audio_passthrough/flow3r.toml
+
1
−
1
View file @
18a20b5d
...
...
@@ -10,4 +10,4 @@ author = "ave"
license
=
"LGPL-3.0-only"
url
=
"https://git.flow3r.garden/flow3r/flow3r-firmware"
description
=
"Allows toggling audio passthrough through line-in/mic to speaker or lineout."
version
=
6
version
=
7
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