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
208c5d2f
Commit
208c5d2f
authored
2 years ago
by
David Trattnig
Browse files
Options
Downloads
Patches
Plain Diff
Feat: Provide version as server function
parent
41c952a7
No related branches found
No related tags found
1 merge request
!3
Liquidsoap 2 migration
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/serverfunctions.liq
+14
-4
14 additions, 4 deletions
src/serverfunctions.liq
src/settings.liq
+2
-2
2 additions, 2 deletions
src/settings.liq
with
16 additions
and
6 deletions
src/serverfunctions.liq
+
14
−
4
View file @
208c5d2f
...
@@ -32,7 +32,7 @@ def icy_update(v) =
...
@@ -32,7 +32,7 @@ def icy_update(v) =
end
end
meta = list.fold(split,[],l)
meta = list.fold(split,[],l)
# Update metadata
# Update metadata
if s0_enable == true then
if s0_enable == true then
icy.update_metadata(
icy.update_metadata(
mount=s0_mount,
mount=s0_mount,
...
@@ -124,6 +124,16 @@ server.register("update", namespace="metadata",
...
@@ -124,6 +124,16 @@ server.register("update", namespace="metadata",
# end
# end
#)
#)
# are outgoing streams connected?
server.register(namespace="auraengine",
description="returns the version of Engine Core",
usage="version",
"version",
fun (s) -> begin
engine_version
end
)
# are outgoing streams connected?
# are outgoing streams connected?
server.register(namespace="auraengine",
server.register(namespace="auraengine",
description="returns if outgoing streams are connected",
description="returns if outgoing streams are connected",
...
@@ -137,7 +147,7 @@ server.register(namespace="auraengine",
...
@@ -137,7 +147,7 @@ server.register(namespace="auraengine",
# return a state of the inputs/outputs of the soundserver as JSON
# return a state of the inputs/outputs of the soundserver as JSON
server.register(namespace = "auraengine",
server.register(namespace = "auraengine",
description="returns enabled line
outs/lineins,
connected outgoing streams
, and recorder. Also returns fallbacksettings.
",
description="returns enabled line
-in, line-out and
connected outgoing streams",
usage="state",
usage="state",
"state",
"state",
fun(s) -> begin
fun(s) -> begin
...
@@ -169,7 +179,7 @@ server.register(namespace = "auraengine",
...
@@ -169,7 +179,7 @@ server.register(namespace = "auraengine",
ret
ret
# outgoing streams enabled?
# outgoing streams enabled?
#ret = "stream_0_enabled:#{!s0_enable}, stream_1_enabled:#{!s1_enable}, stream_2_enabled:#{!s2_enable}, stream_3_enabled:#{!s3_enable}, stream_4_enabled:#{!s4_enable}, "
#ret = "stream_0_enabled:#{!s0_enable}, stream_1_enabled:#{!s1_enable}, stream_2_enabled:#{!s2_enable}, stream_3_enabled:#{!s3_enable}, stream_4_enabled:#{!s4_enable}, "
#ret = ret^"linein_0_enabled:#{a0_in != ''}, linein_1_enabled:#{a1_in != ''}, linein_2_enabled:#{a2_in != ''}, linein_3_enabled:#{a3_in != ''}, linein_4_enabled:#{a4_in != ''}, "
#ret = ret^"linein_0_enabled:#{a0_in != ''}, linein_1_enabled:#{a1_in != ''}, linein_2_enabled:#{a2_in != ''}, linein_3_enabled:#{a3_in != ''}, linein_4_enabled:#{a4_in != ''}, "
#ret = ret^"lineout_0_enabled:#{a0_out != ''}, lineout_1_enabled:#{a1_out != ''}, lineout_2_enabled:#{a2_out != ''}, lineout_3_enabled:#{a3_out != ''}, lineout_4_enabled:#{a4_out != ''}, "
#ret = ret^"lineout_0_enabled:#{a0_out != ''}, lineout_1_enabled:#{a1_out != ''}, lineout_2_enabled:#{a2_out != ''}, lineout_3_enabled:#{a3_out != ''}, lineout_4_enabled:#{a4_out != ''}, "
#ret = ret^"fallback_max_blank:#{fallback_max_blank}, fallback_min_noise:#{fallback_min_noise}, fallback_threshold:#{fallback_threshold}"
#ret = ret^"fallback_max_blank:#{fallback_max_blank}, fallback_min_noise:#{fallback_min_noise}, fallback_threshold:#{fallback_threshold}"
...
@@ -204,7 +214,7 @@ ignore(fade_out_time)
...
@@ -204,7 +214,7 @@ ignore(fade_out_time)
# Activate a source by selecting it and setting the volume to 100 (or vice versa)
# Activate a source by selecting it and setting the volume to 100 (or vice versa)
def activate(p) =
def activate(p) =
params=string.split(separator=" ", p)
params=string.split(separator=" ", p)
if list.length(params) < 2 then
if list.length(params) < 2 then
print(p)
print(p)
"Usage: mixer.activate <source nb> <true|false>"
"Usage: mixer.activate <source nb> <true|false>"
...
...
This diff is collapsed.
Click to expand it.
src/settings.liq
+
2
−
2
View file @
208c5d2f
...
@@ -98,9 +98,9 @@ soundsystem = list.assoc(default="", "soundsystem", ini)
...
@@ -98,9 +98,9 @@ soundsystem = list.assoc(default="", "soundsystem", ini)
use_alsa = soundsystem == "alsa"
use_alsa = soundsystem == "alsa"
use_jack = soundsystem == "jack"
use_jack = soundsystem == "jack"
version = process.read("cat ../VERSION")
engine_
version = process.read("cat ../VERSION")
print("**************************************************************************************")
print("**************************************************************************************")
print("AURA Engine:Core v#{version} starting ...")
print("AURA Engine:Core v#{
engine_
version} starting ...")
print("**************************************************************************************")
print("**************************************************************************************")
alsa_use_buffer = ref (true)
alsa_use_buffer = ref (true)
...
...
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