Update to Liquidsoap 1.4.0.

src/Entity/StationMedia.php

@@ -670,7 +670,7 @@ class StationMedia
             'duration' => $this->length,
             'song_id' => $this->getSong()->getId(),
             'media_id' => $this->id,
-            'liq_start_next' => $this->fade_overlap,
+            'liq_cross_duration' => $this->fade_overlap,
             'liq_fade_in' => $this->fade_in,
             'liq_fade_out' => $this->fade_out,
             'liq_cue_in' => $this->cue_in,

src/Radio/Backend/Liquidsoap.php

@@ -849,15 +849,10 @@ class Liquidsoap extends AbstractBackend implements EventSubscriberInterface
 
         if (self::CROSSFADE_DISABLED !== $crossfade_type && $crossfade > 0) {
             $start_next = round($crossfade * 1.5, 2);
-
-            if (self::CROSSFADE_SMART === $crossfade_type) {
-                $crossfade_function = 'smart_crossfade';
-            } else {
-                $crossfade_function = 'crossfade';
-            }
+            $crossfadeIsSmart = (self::CROSSFADE_SMART === $crossfade_type) ? 'true' : 'false';
 
             $event->appendLines([
-                'radio = ' . $crossfade_function . '(start_next=' . self::toFloat($start_next) . ',fade_out=' . self::toFloat($crossfade) . ',fade_in=' . self::toFloat($crossfade) . ',radio)',
+                'radio = crossfade(smart=' . $crossfadeIsSmart . ', duration=' . self::toFloat($start_next) . ',fade_out=' . self::toFloat($crossfade) . ',fade_in=' . self::toFloat($crossfade) . ',radio)',
             ]);
         }
 

update.sh

@@ -32,7 +32,7 @@ else
 fi
 
 APP_ENV="${APP_ENV:-production}"
-UPDATE_REVISION="${UPDATE_REVISION:-44}"
+UPDATE_REVISION="${UPDATE_REVISION:-45}"
 
 echo "Updating AzuraCast (Environment: $APP_ENV, Update revision: $UPDATE_REVISION)"
 

util/ansible/roles/azuracast-radio/tasks/main.yml

@@ -70,41 +70,23 @@
        - unzip
        - bubblewrap
 
-  - name: Initialize OPAM (Xenial) - This takes a while...
+  - name: Initialize OPAM - This takes a while...
     become_user: azuracast
-    shell: "opam init -a --disable-sandboxing --bare && opam switch create 4.05.0"
+    shell: "opam init -a --disable-sandboxing --bare && opam switch create 4.08.0"
     args:
       chdir: "{{ app_base }}"
       executable: "bash" # Fixes some possible hang issues.
-    when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial'
-
-  - name: Initialize OPAM (Bionic)
-    become_user: azuracast
-    shell: "opam init --disable-sandboxing -a"
-    args:
-      chdir: "{{ app_base }}"
-      executable: "bash" # Fixes some possible hang issues.
-    when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'bionic'
 
   - name: Build and Install Liquidsoap
     become_user: azuracast
-    shell: "opam install -y samplerate.0.1.4 taglib.0.3.3 mad.0.4.5 faad.0.4.0 fdkaac.0.2.1 lame.0.3.3 vorbis.0.7.1 cry.0.6.1 flac.0.1.4 opus.0.1.2 duppy.0.8.0 ssl liquidsoap.1.3.7"
+    shell: "opam install -y samplerate.0.1.4 taglib.0.3.3 mad.0.4.5 faad.0.4.0 fdkaac.0.3.1 lame.0.3.3 vorbis.0.7.1 cry.0.6.1 flac.0.1.5 opus.0.1.3 duppy.0.8.0 ssl liquidsoap.1.4.0"
     args:
       chdir: "{{ app_base }}"
       executable: "bash" # Fixes some possible hang issues.
 
-  - name: Link Liquidsoap binary (Xenial)
+  - name: Link Liquidsoap binary
     file:
-      src: /var/azuracast/.opam/4.05.0/bin/liquidsoap
+      src: /var/azuracast/.opam/4.08.0/bin/liquidsoap
       dest: /usr/local/bin/liquidsoap
       state: link
       force: yes
-    when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial'
-
-  - name: Link Liquidsoap binary (Bionic)
-    file:
-      src: /var/azuracast/.opam/default/bin/liquidsoap
-      dest: /usr/local/bin/liquidsoap
-      state: link
-      force: yes
-    when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'bionic'

util/ansible/update.yml

@@ -13,7 +13,7 @@
   roles:
     - init
     - azuracast-config
-    - { role: azuracast-radio, when: update_revision|int < 40 }
+    - { role: azuracast-radio, when: update_revision|int < 45 }
     - { role: supervisord, when: update_revision|int < 13 }
     - { role: mariadb, when: update_revision|int < 15 }
     - { role: nginx, when: update_revision|int < 44 }