Add declaration of android supported audio formats

blackcandy-org · Jan 2, 2024 · 404d1de · 404d1de
1 parent 8fb5b0f
commit 404d1de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -44,9 +44,10 @@ class ApplicationController < ActionController::Base
   def need_transcode?(song)
     song_format = song.format
 
-    return true unless song_format.in?(Stream::SUPPORTED_FORMATS)
+    return true unless song_format.in?(Stream::WEB_SUPPORTED_FORMATS)
     return true if browser.safari? && !song_format.in?(Stream::SAFARI_SUPPORTED_FORMATS)
     return true if ios_app? && !song_format.in?(Stream::IOS_SUPPORTED_FORMATS)
+    return true if android_app? && !song_format.in?(Stream::ANDROID_SUPPORTED_FORMATS)
 
     Setting.allow_transcode_lossless? ? song.lossless? : false
   end

diff --git a/app/models/stream.rb b/app/models/stream.rb
@@ -3,9 +3,10 @@
 class Stream
   extend Forwardable
 
-  SUPPORTED_FORMATS = MediaFile::SUPPORTED_FORMATS - %w[wma]
+  WEB_SUPPORTED_FORMATS = MediaFile::SUPPORTED_FORMATS - %w[wma]
   SAFARI_SUPPORTED_FORMATS = MediaFile::SUPPORTED_FORMATS - %w[ogg opus oga]
-  IOS_SUPPORTED_FORMATS = MediaFile::SUPPORTED_FORMATS - %w[ogg opus oga]
+  IOS_SUPPORTED_FORMATS = SAFARI_SUPPORTED_FORMATS
+  ANDROID_SUPPORTED_FORMATS = WEB_SUPPORTED_FORMATS
 
   TRANSCODE_FORMAT = "mp3"
   TRANSCODE_CACHE_DIRECTORY = Rails.root.join("tmp/cache/media_file")