Skip to content

Commit

Permalink
Reimplement audioscrobbler natively (#4250)
Browse files Browse the repository at this point in the history
  • Loading branch information
toots authored Dec 14, 2024
1 parent 149c064 commit e5d8a5f
Show file tree
Hide file tree
Showing 15 changed files with 506 additions and 571 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ New:
wav dexcoder.
- Added optional `buffer_size` parameter to `input.alsa` and
`output.alsa` (#4243)
- Reimplemented audioscrobbler support natively using the more
recent protocol (#4250)

Changed:

Expand Down
19 changes: 10 additions & 9 deletions doc/content/liq/radiopi.liq
Original file line number Diff line number Diff line change
Expand Up @@ -128,22 +128,23 @@ interlude = single("/home/radiopi/fallback.mp3")
# Lastfm submission
def lastfm(m) =
if
(m["type"] == "chansons")
then
if
m["type"] == "chansons"
and

(
m["canal"] == "reggae"
or
m["canal"] == "Jazz"
or
m["canal"] == "That70Sound"
)
then
canal =
if (m["canal"] == "That70Sound") then "70sound" else m["canal"] end
user = "radiopi-" ^ canal
lastfm.submit(user=user, password="xXXxx", m)
end

then
canal = if (m["canal"] == "That70Sound") then "70sound" else m["canal"] end
username = "radiopi-" ^ canal
audioscrobbler.api.track.scrobble.metadata(
username=username, password="xXXxx", m
)
end
end

Expand Down
2 changes: 0 additions & 2 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
jemalloc
ladspa
lame
lastfm
lilv
lo
mad
Expand Down Expand Up @@ -123,7 +122,6 @@
(inotify (< 1.0))
(ladspa (< 0.2.0))
(lame (< 0.3.7))
(lastfm (< 0.3.4))
(lo (< 0.2.0))
(mad (< 0.5.0))
(magic (< 0.6))
Expand Down
2 changes: 0 additions & 2 deletions liquidsoap-core.opam
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ depopts: [
"jemalloc"
"ladspa"
"lame"
"lastfm"
"lilv"
"lo"
"mad"
Expand Down Expand Up @@ -89,7 +88,6 @@ conflicts: [
"inotify" {< "1.0"}
"ladspa" {< "0.2.0"}
"lame" {< "0.3.7"}
"lastfm" {< "0.3.4"}
"lo" {< "0.2.0"}
"mad" {< "0.5.0"}
"magic" {< "0.6"}
Expand Down
1 change: 0 additions & 1 deletion src/config/lastfm_option.disabled.ml

This file was deleted.

1 change: 0 additions & 1 deletion src/config/lastfm_option.enabled.ml

This file was deleted.

110 changes: 0 additions & 110 deletions src/core/builtins/builtins_lastfm.ml

This file was deleted.

1 change: 0 additions & 1 deletion src/core/builtins/builtins_optionals.ml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ let () =
("irc", Irc_option.enabled);
("ladspa", Ladspa_option.enabled);
("lame", Lame_option.enabled);
("lastfm", Lastfm_option.enabled);
("lilv", Lilv_option.enabled);
("lo", Lo_option.enabled);
("mad", Mad_option.enabled);
Expand Down
14 changes: 0 additions & 14 deletions src/core/dune
Original file line number Diff line number Diff line change
Expand Up @@ -465,14 +465,6 @@
(optional)
(modules lame_encoder))

(library
(name liquidsoap_lastfm)
(libraries lastfm liquidsoap_core)
(library_flags -linkall)
(wrapped false)
(optional)
(modules builtins_lastfm liqfm))

(library
(name liquidsoap_lilv)
(libraries lilv liquidsoap_core)
Expand Down Expand Up @@ -737,7 +729,6 @@
jemalloc_option
ladspa_option
lame_option
lastfm_option
lilv_option
lo_option
mad_option
Expand Down Expand Up @@ -858,11 +849,6 @@
from
(liquidsoap_lame -> lame_option.enabled.ml)
(-> lame_option.disabled.ml))
(select
lastfm_option.ml
from
(liquidsoap_lastfm -> lastfm_option.enabled.ml)
(-> lastfm_option.disabled.ml))
(select
lilv_option.ml
from
Expand Down
Loading

0 comments on commit e5d8a5f

Please sign in to comment.