From a7158a79af8181da0a055db16f1e4d0eeac8bbbd Mon Sep 17 00:00:00 2001 From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com> Date: Mon, 6 Jun 2016 20:40:12 +0200 Subject: [PATCH] Support new audio formats --- .../ohi/andre/consolelauncher/commands/raw/tracks.java | 6 +++++- .../andre/consolelauncher/managers/MusicManager.java | 10 +++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/ohi/andre/consolelauncher/commands/raw/tracks.java b/app/src/main/java/ohi/andre/consolelauncher/commands/raw/tracks.java index a9a47ea..de58d07 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/commands/raw/tracks.java +++ b/app/src/main/java/ohi/andre/consolelauncher/commands/raw/tracks.java @@ -16,7 +16,11 @@ public class tracks implements CommandAbstraction { @Override public String exec(ExecInfo info) { List<String> names = info.player.getNames(); - Tuils.addPrefix(names, " "); + if(names == null) { + return info.res.getString(R.string.output_musicfoldererror); + } + + Tuils.addPrefix(names, Tuils.DOUBLE_SPACE); Tuils.insertHeaders(names, false); return Tuils.toPlanString(names); } diff --git a/app/src/main/java/ohi/andre/consolelauncher/managers/MusicManager.java b/app/src/main/java/ohi/andre/consolelauncher/managers/MusicManager.java index 84afcfd..0872d3c 100755 --- a/app/src/main/java/ohi/andre/consolelauncher/managers/MusicManager.java +++ b/app/src/main/java/ohi/andre/consolelauncher/managers/MusicManager.java @@ -19,6 +19,8 @@ import ohi.andre.consolelauncher.tuils.broadcast.HeadsetBroadcast; public class MusicManager implements OnCompletionListener { + public static final String[] MUSIC_EXTENSIONS = {".mp3", ".wav", ".ogg", ".flac"}; + public static final boolean USE_SCROLL_COMPARE = true; private File songFolder; @@ -45,6 +47,7 @@ public class MusicManager implements OnCompletionListener { c.registerReceiver(headsetReceiver, new IntentFilter(Intent.ACTION_HEADSET_PLUG)); randomActive = Boolean.parseBoolean(preferencesManager.getValue(PreferencesManager.PLAY_RANDOM)); + songFolder = new File(preferencesManager.getValue(PreferencesManager.SONGSFOLDER)); } @@ -60,14 +63,19 @@ public class MusicManager implements OnCompletionListener { // return the path by complete name public String getPath(String name) { File file = new File(songFolder, name); - if (!file.exists()) + if (!file.exists()) { return null; + } return file.getAbsolutePath(); } // return names public List<String> getNames() { List<File> songs = Tuils.getSongsInFolder(songFolder); + if(songs == null) { + return null; + } + List<String> names = new ArrayList<>(); for (File file : songs) -- GitLab