Subsonic Help

commit c0b807de17b21903158a2fec3e43e305e3b81c50 Author: haxzamatic Date: Sun Feb 26 15:25:13 2012 -0500 Sindre Mehus diff --git a/AndroidManifest.xml b/AndroidManifest.xml new file mode 100644 index 00000000..2566593c --- /dev/null +++ b/AndroidManifest.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ant.properties b/ant.properties new file mode 100644 index 00000000..fb0849b1 --- /dev/null +++ b/ant.properties @@ -0,0 +1,20 @@ +# This file is used to override default values used by the Ant build system. +# +# This file must be checked in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + +key.store=subsonic.keystore +key.alias=subsonic + diff --git a/assets/fonts/Storopia.ttf b/assets/fonts/Storopia.ttf new file mode 100644 index 00000000..cbdc4c1f Binary files /dev/null and b/assets/fonts/Storopia.ttf differ diff --git a/assets/html/en/index.html b/assets/html/en/index.html new file mode 100644 index 00000000..6462ef1f --- /dev/null +++ b/assets/html/en/index.html @@ -0,0 +1,98 @@ + + + Subsonic Help + + + + + + +

Welcome to Subsonic

+ +

+ With Subsonic you can easily stream or download music from your home computer to your Android phone + (and do lots of other cool stuff too). +

+ +

+ To install the Subsonic server software on your computer, please visit subsonic.org. + It's available for Windows, Mac, Linux and Unix. +

+ +

+ By default, this program is configured to use the Subsonic demo server. Once you've set up your own + server, please go to Settings and change the configuration so that it connects to your own computer. +

+ +

+ You can use this program freely for 30 days. After that you will have to make a donation to the Subsonic project. + As a donor you get the following benefits: +

Unlimited streaming and download to any number of iPhone and Android phones.
Video streaming.
A personal web address for your Subsonic server (yourname.subsonic.org).
No ads in the Subsonic web interface.
Free access to new premium features.

+ +

+ The suggested donation amount is €20, but you can give any amount you like. +

+ +

+ Click one of the buttons to go to PayPal where you can pay by credit card or by using your PayPal account. + Once the donation is processed, you will receive a license key by email. +

+ + + + + + + + +

+ + + + + + + +

€10

+ + + + + + + +

€20

+ + + + + + + +

€25

+ + + + + + + +

€30

+ +

+ For more information, please visit subsonic.org +

+ + + diff --git a/assets/html/fr/index.html b/assets/html/fr/index.html new file mode 100644 index 00000000..4ac8c9c3 --- /dev/null +++ b/assets/html/fr/index.html @@ -0,0 +1,100 @@ + + + Aide de Subsonic + + + + + + +

Bienvenue dans Subsonic

+ +

+ Avec Subsonic, vous pouvez facilement écouter ou télécharger de la musique à partir de votre ordinateur personnel sur votre appareil Android + (et faire plein d'autres trucs cools aussi). +

+ +

+ Pour installer le serveur Subsonic sur votre ordinateur, veuillez visiter subsonic.org. + Celui-ci est disponible pour Windows, Mac, Linux et Unix. +

+ +

+ Par défaut, cette application est configuré pour utiliser le serveur démo Subsonic. + Après avoir configuré votre serveur personnel, veuillez accéder aux Paramètres et modifier la configuration + afin de vous connecter à votre propre ordinateur. +

+ +

+ Vous pouvez utiliser cette application gratuitement pendant 30 jours. + Ensuite, vous devrez effectuer un don au projet Subsonic. + En tant que donateur, vous obtiendrez les bénéfices suivants: +

Écoute et téléchargement illimités vers autant de iPhones et d'appareils Android que désiré.
Écoute de vidéos.
Une adresse web personnalisée pour votre serveur Subsonic (votrenom.subsonic.org).
Aucune publicité dans l'interface web de Subsonic.
Accès gratuit aux nouvelles fonctionnalités avancées.

+ +

+ Le montant suggéré pour le don est de 20€, mais n'importe quel montant fera l'affaire. +

+ +

+ Cliquez l'un des boutons suivants pour accéder à PayPal, d'où vous pourrez payer soit par carte de crédit ou en utilisant votre compte PayPal. + Une fois le don reçu et traité, vous recevrez votre clé d'activation par courriel. +

+ + + + + + + + +

+ + + + + + + +

10€

+ + + + + + + +

20€

+ + + + + + + +

25€

+ + + + + + + +

30€

+ +

+ Pour plus d'information, veuillez visiter subsonic.org +

+ + + diff --git a/assets/html/img/paypal.gif b/assets/html/img/paypal.gif new file mode 100644 index 00000000..d017250a Binary files /dev/null and b/assets/html/img/paypal.gif differ diff --git a/assets/html/img/subsonic.png b/assets/html/img/subsonic.png new file mode 100644 index 00000000..38c521c5 Binary files /dev/null and b/assets/html/img/subsonic.png differ diff --git a/assets/html/style.css b/assets/html/style.css new file mode 100644 index 00000000..9c1d55f2 --- /dev/null +++ b/assets/html/style.css @@ -0,0 +1,11 @@ +/* +* Taken from http://yui.yahooapis.com/2.8.0r4/build/fonts/fonts.css +*/ +body { + font: 13px / 1.231 arial, helvetica, clean, sans-serif; +} + +table { + font-size:inherit; + font:100%; +} \ No newline at end of file diff --git a/build.xml b/build.xml new file mode 100644 index 00000000..02e7d6ab --- /dev/null +++ b/build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/debug.keystore b/debug.keystore new file mode 100644 index 00000000..1cb2c3d1 Binary files /dev/null and b/debug.keystore differ diff --git a/local.properties b/local.properties new file mode 100644 index 00000000..d80ed913 --- /dev/null +++ b/local.properties @@ -0,0 +1,10 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must *NOT* be checked in Version Control Systems, +# as it contains information specific to your local configuration. + +# location of the SDK. This is only used by Ant +# For customization when using a Version Control System, please read the +# header note. +sdk.dir=c:/progs/android-sdk-windows diff --git a/patches/jukebox-patch.txt b/patches/jukebox-patch.txt new file mode 100644 index 00000000..e796d88f --- /dev/null +++ b/patches/jukebox-patch.txt @@ -0,0 +1,1234 @@ +Index: AndroidManifest.xml +=================================================================== +--- AndroidManifest.xml (revision 2441) ++++ AndroidManifest.xml (working copy) +@@ -114,7 +114,8 @@ + a:authorities="net.sourceforge.subsonic.androidapp.provider.SearchSuggestionProvider"/> + + ++ a:value="net.sourceforge.subsonic.androidapp.activity.QueryReceiverActivity"/> ++ + + + +Index: res/drawable/menu_jukebox.png +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: res/drawable/menu_jukebox.png +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: res/drawable-hdpi-v4/menu_jukebox.png +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: res/drawable-hdpi-v4/menu_jukebox.png +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: res/layout/button_bar.xml +=================================================================== +--- res/layout/button_bar.xml (revision 2441) ++++ res/layout/button_bar.xml (working copy) +@@ -47,6 +47,14 @@ + a:layout_weight="1" + a:layout_width="0dp" + a:layout_height="wrap_content"/> ++ ++ + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +Index: res/menu/jukebox_context.xml +=================================================================== +--- res/menu/jukebox_context.xml (revision 0) ++++ res/menu/jukebox_context.xml (revision 0) +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +Index: res/menu/select_album_context.xml +=================================================================== +--- res/menu/select_album_context.xml (revision 2441) ++++ res/menu/select_album_context.xml (working copy) +@@ -15,5 +15,6 @@ + a:id="@+id/album_menu_pin" + a:title="@string/common.pin" + /> ++ + + +Index: res/menu/select_artist_context.xml +=================================================================== +--- res/menu/select_artist_context.xml (revision 2441) ++++ res/menu/select_artist_context.xml (working copy) +@@ -15,5 +15,6 @@ + a:id="@+id/artist_menu_pin" + a:title="@string/common.pin" + /> ++ + + +Index: res/menu/select_song_context.xml +=================================================================== +--- res/menu/select_song_context.xml (revision 2441) ++++ res/menu/select_song_context.xml (working copy) +@@ -15,5 +15,10 @@ + a:id="@+id/song_menu_play_last" + a:title="@string/common.play_last" + /> ++ ++ + + +Index: res/values/strings.xml +=================================================================== +--- res/values/strings.xml (revision 2441) ++++ res/values/strings.xml (working copy) +@@ -226,6 +226,14 @@ + + One day left of trial period + %d days left of trial period +- ++ ++ Jukebox ++ Start ++ Stop ++ Next ++ Previous ++ Clear ++ Remove ++ Add to Jukebox + + +Index: src/net/sourceforge/subsonic/androidapp/activity/JukeboxActivity.java +=================================================================== +--- src/net/sourceforge/subsonic/androidapp/activity/JukeboxActivity.java (revision 0) ++++ src/net/sourceforge/subsonic/androidapp/activity/JukeboxActivity.java (revision 0) +@@ -0,0 +1,235 @@ ++/* ++ This file is part of Subsonic. ++ ++ Subsonic is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or ++ (at your option) any later version. ++ ++ Subsonic is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with Subsonic. If not, see . ++ ++ Copyright 2009 (C) Sindre Mehus ++ */ ++ ++package net.sourceforge.subsonic.androidapp.activity; ++ ++import java.util.List; ++ ++import net.sourceforge.subsonic.androidapp.R; ++import net.sourceforge.subsonic.androidapp.domain.Jukebox; ++import net.sourceforge.subsonic.androidapp.domain.MusicDirectory; ++import net.sourceforge.subsonic.androidapp.domain.MusicDirectory.Entry; ++import net.sourceforge.subsonic.androidapp.service.MusicService; ++import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory; ++import net.sourceforge.subsonic.androidapp.util.BackgroundTask; ++import net.sourceforge.subsonic.androidapp.util.JukeboxSongView; ++import net.sourceforge.subsonic.androidapp.util.ProgressListener; ++import net.sourceforge.subsonic.androidapp.util.TabActivityBackgroundTask; ++import net.sourceforge.subsonic.androidapp.util.Util; ++import android.os.Bundle; ++import android.view.ContextMenu; ++import android.view.MenuInflater; ++import android.view.MenuItem; ++import android.view.View; ++import android.view.View.OnClickListener; ++import android.view.ViewGroup; ++import android.widget.AdapterView; ++import android.widget.AdapterView.OnItemClickListener; ++import android.widget.ArrayAdapter; ++import android.widget.ImageButton; ++import android.widget.ListView; ++import android.widget.SeekBar; ++import android.widget.SeekBar.OnSeekBarChangeListener; ++ ++/** ++ * @author meld0 ++ * ++ */ ++public class JukeboxActivity extends SubsonicTabActivity implements ProgressListener, OnClickListener, OnSeekBarChangeListener, OnItemClickListener{ ++ ++ private ImageButton play, stop, next, prev, shuffle; ++ private ListView entryList; ++ private SeekBar gain; ++ private Jukebox jukebox; ++ ++ @Override ++ public void onCreate(Bundle savedInstanceState){ ++ super.onCreate(savedInstanceState); ++ setContentView(R.layout.jukebox); ++ ++ jukebox = new Jukebox(); ++ ++ play = (ImageButton) findViewById(R.id.jukebox_start); ++ stop = (ImageButton) findViewById(R.id.jukebox_stop); ++ prev = (ImageButton) findViewById(R.id.jukebox_previous); ++ next = (ImageButton) findViewById(R.id.jukebox_next); ++ shuffle = (ImageButton) findViewById(R.id.jukebox_shuffle); ++ entryList = (ListView) findViewById(R.id.jukebox_list); ++ ++ gain = (SeekBar) findViewById(R.id.jukebox_seek); ++ gain.setMax(100); ++ ++ play.setOnClickListener(this); ++ stop.setOnClickListener(this); ++ next.setOnClickListener(this); ++ prev.setOnClickListener(this); ++ shuffle.setOnClickListener(this); ++ gain.setOnSeekBarChangeListener(this); ++ entryList.setOnItemClickListener(this); ++ ++ registerForContextMenu(entryList); ++ load(); ++ } ++ ++ @Override ++ public void updateProgress(int messageId){ ++ ++ } ++ ++ private void load(){ ++ load(Jukebox.GET); ++ } ++ ++ private void load(String action){ ++ load(action, ""); ++ } ++ ++ private void load(final String action, final String additional){ ++ BackgroundTask task = new TabActivityBackgroundTask(this){ ++ ++ protected Boolean doInBackground() throws Throwable{ ++ boolean update = false; ++ if (!Util.isOffline(JukeboxActivity.this)) { ++ MusicService musicService = MusicServiceFactory.getMusicService(JukeboxActivity.this); ++ jukebox.lastAction = action; ++ jukebox = musicService.getJukebox(jukebox, JukeboxActivity.this, this, additional); ++ update = true; ++ } ++ return update; ++ } ++ ++ protected void done(Boolean result){ ++ if (jukebox.isSuccess()) { ++ if (jukebox.lastAction.equals(Jukebox.SET_GAIN)) { ++ jukebox.setGain((int) (Double.valueOf(additional.split("=")[1]) * 100)); ++ gain.setProgress(jukebox.getGain()); ++ } else if (jukebox.lastAction.equals(Jukebox.REMOVE_ITEM)) ((SongListAdapter) entryList.getAdapter()).remove((Entry) entryList.getAdapter().getItem( ++ Integer.valueOf(additional.split("=")[1]))); ++ else if (jukebox.lastAction.equals(Jukebox.CLEAR_PLAYLIST)) ((SongListAdapter) entryList.getAdapter()).clear(); ++ else if (jukebox.lastAction.equals(Jukebox.SKIP_TO_INDEX)) jukebox.setCurrentIndex(Integer.valueOf(additional.split("=")[1])); ++ ++ if (jukebox.isNewPlaylist()) entryList.setAdapter(new SongListAdapter(jukebox.getChildren())); ++ } ++ } ++ }; ++ task.execute(); ++ } ++ ++ @Override ++ public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo){ ++ super.onCreateContextMenu(menu, view, menuInfo); ++ MenuInflater inflater = getMenuInflater(); ++ inflater.inflate(R.menu.jukebox_context, menu); ++ } ++ ++ @Override ++ public boolean onContextItemSelected(MenuItem menuItem){ ++ AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo(); ++ switch (menuItem.getItemId()) { ++ case R.id.jukebox_remove: ++ load(Jukebox.REMOVE_ITEM, "index=" + info.position); ++ break; ++ case R.id.jukebox_clear: ++ load(Jukebox.CLEAR_PLAYLIST); ++ break; ++ default: ++ return super.onContextItemSelected(menuItem); ++ } ++ return true; ++ } ++ ++ @Override ++ protected void onResume(){ ++ super.onResume(); ++ load(); ++ } ++ ++ @Override ++ public void onClick(View arg0){ ++ if (arg0.equals(this.play)) { ++ load(Jukebox.START_PLAYBACK); ++ } else if (arg0.equals(this.stop)) { ++ load(Jukebox.STOP_PLAYBACK); ++ } else if (arg0.equals(this.prev)) { ++ loadW(); ++ load(Jukebox.SKIP_TO_INDEX, "index=" + (jukebox.getCurrentIndex() - 1)); // TODO // MAYBE // BETTER // ? ++ } else if (arg0.equals(this.next)) { ++ loadW(); ++ load(Jukebox.SKIP_TO_INDEX, "index=" + (jukebox.getCurrentIndex() + 1)); ++ } else if (arg0.equals(this.shuffle)) { ++ load(Jukebox.SHUFFLE_PLAYLIST); ++ load(); ++ } ++ } ++ ++ @Override ++ public void onProgressChanged(SeekBar arg0, int arg1, boolean arg2){ ++ } ++ ++ @Override ++ public void onStartTrackingTouch(SeekBar arg0){ ++ } ++ ++ @Override ++ public void onStopTrackingTouch(SeekBar arg0){ ++ load(Jukebox.SET_GAIN, "gain=" + ((double) arg0.getProgress() / 100)); ++ } ++ ++ private class SongListAdapter extends ArrayAdapter{ ++ ++ public SongListAdapter(List entries){ ++ super(JukeboxActivity.this, android.R.layout.simple_list_item_1, entries); ++ } ++ ++ @Override ++ public View getView(int position, View convertView, ViewGroup parent){ ++ JukeboxSongView view; ++ if (convertView != null && convertView instanceof JukeboxSongView) { ++ view = (JukeboxSongView) convertView; ++ } else { ++ view = new JukeboxSongView(JukeboxActivity.this); ++ } ++ MusicDirectory.Entry entry = getItem(position); ++ ++ if (position == jukebox.getCurrentIndex()) { ++ view.setSong(entry, false, true); ++ } else view.setSong(entry, false, false); ++ return view; ++ } ++ } ++ ++ @Override ++ public void onItemClick(AdapterView arg0, View arg1, int arg2, long arg3){ ++ load(Jukebox.SKIP_TO_INDEX, "index=" + arg3); ++ } ++ ++ public void loadW(){ ++ if (!Util.isOffline(JukeboxActivity.this)) { ++ MusicService musicService = MusicServiceFactory.getMusicService(JukeboxActivity.this); ++ jukebox.lastAction = Jukebox.GET; ++ try { ++ jukebox = musicService.getJukebox(jukebox, JukeboxActivity.this, this, ""); ++ } catch (Exception e) { ++ // TODO Auto-generated catch block ++ e.printStackTrace(); ++ } ++ } ++ } ++ ++} +Index: src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java +=================================================================== +--- src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java (revision 2441) ++++ src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java (working copy) +@@ -252,6 +252,9 @@ + case R.id.album_menu_pin: + downloadRecursively(entry.getId(), true, true, false); + break; ++ case R.id.album_menu_jukebox_add: ++ addToJukebox(entry.getId()); ++ break; + case R.id.song_menu_play_now: + getDownloadService().download(songs, false, true, true); + break; +@@ -261,6 +264,8 @@ + case R.id.song_menu_play_last: + getDownloadService().download(songs, false, false, false); + break; ++ case R.id.song_menu_jukebox_add: ++ addToJukebox(entry); + default: + return super.onContextItemSelected(menuItem); + } +Index: src/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.java +=================================================================== +--- src/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.java (revision 2441) ++++ src/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.java (working copy) +@@ -210,6 +210,9 @@ + case R.id.artist_menu_pin: + downloadRecursively(artist.getId(), true, true, false); + break; ++ case R.id.artist_menu_jukebox_add: ++ addToJukebox(artist.getId()); ++ break; + default: + return super.onContextItemSelected(menuItem); + } +Index: src/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.java +=================================================================== +--- src/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.java (revision 2441) ++++ src/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.java (working copy) +@@ -23,6 +23,16 @@ + import java.util.LinkedList; + import java.util.List; + ++import net.sourceforge.subsonic.androidapp.R; ++import net.sourceforge.subsonic.androidapp.domain.MusicDirectory; ++import net.sourceforge.subsonic.androidapp.service.DownloadService; ++import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl; ++import net.sourceforge.subsonic.androidapp.service.MusicService; ++import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory; ++import net.sourceforge.subsonic.androidapp.util.Constants; ++import net.sourceforge.subsonic.androidapp.util.ImageLoader; ++import net.sourceforge.subsonic.androidapp.util.ModalBackgroundTask; ++import net.sourceforge.subsonic.androidapp.util.Util; + import android.app.Activity; + import android.content.Context; + import android.content.Intent; +@@ -39,16 +49,6 @@ + import android.view.View; + import android.view.Window; + import android.widget.TextView; +-import net.sourceforge.subsonic.androidapp.R; +-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory; +-import net.sourceforge.subsonic.androidapp.service.DownloadService; +-import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl; +-import net.sourceforge.subsonic.androidapp.service.MusicService; +-import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory; +-import net.sourceforge.subsonic.androidapp.util.Constants; +-import net.sourceforge.subsonic.androidapp.util.ImageLoader; +-import net.sourceforge.subsonic.androidapp.util.ModalBackgroundTask; +-import net.sourceforge.subsonic.androidapp.util.Util; + + /** + * @author Sindre Mehus +@@ -63,6 +63,7 @@ + private View musicButton; + private View searchButton; + private View playlistButton; ++ private View jukeboxButton; + private View nowPlayingButton; + + @Override +@@ -118,6 +119,14 @@ + Util.startActivityWithoutTransition(SubsonicTabActivity.this, intent); + } + }); ++ ++ jukeboxButton = findViewById(R.id.button_bar_jukebox); ++ jukeboxButton.setOnClickListener(new View.OnClickListener() { ++ @Override ++ public void onClick(View view) { ++ Util.startActivityWithoutTransition(SubsonicTabActivity.this, JukeboxActivity.class); ++ } ++ }); + + nowPlayingButton = findViewById(R.id.button_bar_now_playing); + nowPlayingButton.setOnClickListener(new View.OnClickListener() { +@@ -225,6 +234,22 @@ + int visibility = Util.isOffline(this) ? View.GONE : View.VISIBLE; + searchButton.setVisibility(visibility); + playlistButton.setVisibility(visibility); ++ jukeboxButton.setVisibility(visibility); ++ /* ++ * The following block would check for valid Permissions ++ * but it is called too often -> network traffic/ problems ? ++ * ++ MusicService musicService = MusicServiceFactory.getMusicService(this); ++ try { ++ User user = musicService.getUser(this, null); ++ if(!user.isJukeboxControl()){ ++ jukeboxButton.setVisibility(View.GONE); ++ } ++ } catch (Exception e) { ++ // TODO Auto-generated catch block ++ e.printStackTrace(); ++ } ++ */ + } + + public void setProgressVisible(boolean visible) { +@@ -363,5 +388,67 @@ + } + } + } ++ ++ protected void addToJukebox(String id) { ++ ++ List entries = new LinkedList(); ++ MusicService musicService = MusicServiceFactory.getMusicService(this); ++ MusicDirectory root; ++ ++ try { ++ root = musicService.getMusicDirectory(id, false, SubsonicTabActivity.this, null); ++ collectEntries(root, entries); ++ } catch (Exception e) { ++ // TODO Auto-generated catch block ++ e.printStackTrace(); ++ } ++ ++ ++ StringBuilder build = new StringBuilder(); ++ build.append("action=add"); ++ for(MusicDirectory.Entry entry2: entries){ ++ build.append("&id="); ++ build.append(entry2.getId()); ++ } ++ try { ++ musicService.getJukebox(null, this, null, build.toString()); ++ } catch (Exception e) { ++ // TODO Auto-generated catch block ++ e.printStackTrace(); ++ } ++ ++ } ++ ++ protected void addToJukebox(MusicDirectory.Entry entry) { ++ try { ++ MusicService musicService = MusicServiceFactory.getMusicService(this); ++ musicService.getJukebox(null, this, null, "action=add&id="+entry.getId()); ++ } catch (Exception e) { ++ // TODO Auto-generated catch block ++ e.printStackTrace(); ++ } ++ } ++ ++ private List collectEntries(MusicDirectory parent, List songs){ ++ for (MusicDirectory.Entry song : parent.getChildren(false, true)) { ++ if (!song.isVideo()) { ++ songs.add(song); ++ } ++ } ++ for (MusicDirectory.Entry dir : parent.getChildren(true, false)) { ++ MusicService musicService = MusicServiceFactory.getMusicService(SubsonicTabActivity.this); ++ try { ++ collectEntries(musicService.getMusicDirectory(dir.getId(), false, SubsonicTabActivity.this, null), songs); ++ } catch (Exception e) { ++ // TODO Auto-generated catch block ++ e.printStackTrace(); ++ } ++ } ++ ++ return songs; ++ } ++ ++ ++ + } + +Index: src/net/sourceforge/subsonic/androidapp/domain/Jukebox.java +=================================================================== +--- src/net/sourceforge/subsonic/androidapp/domain/Jukebox.java (revision 0) ++++ src/net/sourceforge/subsonic/androidapp/domain/Jukebox.java (revision 0) +@@ -0,0 +1,113 @@ ++/* ++ This file is part of Subsonic. ++ ++ Subsonic is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or ++ (at your option) any later version. ++ ++ Subsonic is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with Subsonic. If not, see . ++ ++ Copyright 2009 (C) Sindre Mehus ++ */ ++ ++package net.sourceforge.subsonic.androidapp.domain; ++ ++import java.io.Serializable; ++import java.util.List; ++ ++/** ++ * @author meld0 ++ * ++ */ ++public class Jukebox extends MusicDirectory implements Serializable{ ++ ++ public String lastAction; ++ ++ //get, start, stop, skip, add, clear, remove, shuffle, setGain ++ public static final String GET = "get"; ++ public static final String START_PLAYBACK = "start"; ++ public static final String STOP_PLAYBACK = "stop"; ++ public static final String SKIP_TO_INDEX = "skip"; ++ public static final String ADD_TO_PLAYLIST = "add"; ++ public static final String CLEAR_PLAYLIST = "clear"; ++ public static final String REMOVE_ITEM = "remove"; ++ public static final String SHUFFLE_PLAYLIST = "shuffle"; ++ public static final String SET_GAIN = "setGain"; ++ ++ public Jukebox() { ++ super(); ++ } ++ ++ public boolean isPlaying() { ++ return playing; ++ } ++ ++ public void setPlaying(boolean playing) { ++ this.playing = playing; ++ } ++ ++ public int getGain() { ++ return gain; ++ } ++ ++ public void setGain(int gain) { ++ this.gain = gain; ++ } ++ ++ public int getCurrentIndex() { ++ return currentIndex; ++ } ++ ++ public void setCurrentIndex(int currentIndex) { ++ this.currentIndex = currentIndex; ++ } ++ ++ public boolean isAvailable() { ++ return available; ++ } ++ ++ public boolean isSuccess() { ++ return success; ++ } ++ ++ public void setAvailable(boolean available) { ++ this.available = available; ++ } ++ ++ public void setSuccess(boolean success) { ++ this.success = success; ++ } ++ ++ public boolean isNewPlaylist() { ++ return newPlaylist; ++ } ++ ++ public void setNewPlaylist(boolean newPlaylist) { ++ this.newPlaylist = newPlaylist; ++ } ++ ++ private boolean playing = false; ++ private int gain = 0; ++ private int currentIndex = 0; ++ private boolean available = false; ++ private boolean success = false; ++ private boolean newPlaylist = false; ++ ++ public void addChildren(List children){ ++ super.addChildren(children); ++ } ++ ++ public void reset(){ ++ this.available = false; ++ this.success = false; ++ this.newPlaylist = false; ++ } ++ ++} +Index: src/net/sourceforge/subsonic/androidapp/domain/MusicDirectory.java +=================================================================== +--- src/net/sourceforge/subsonic/androidapp/domain/MusicDirectory.java (revision 2441) ++++ src/net/sourceforge/subsonic/androidapp/domain/MusicDirectory.java (working copy) +@@ -59,6 +59,13 @@ + } + return result; + } ++ ++ protected void addChildren(List children){ ++ if(!children.isEmpty()) { ++ this.children.clear(); ++ this.children.addAll(children); ++ } ++ } + + public static class Entry implements Serializable { + private String id; +Index: src/net/sourceforge/subsonic/androidapp/domain/User.java +=================================================================== +--- src/net/sourceforge/subsonic/androidapp/domain/User.java (revision 0) ++++ src/net/sourceforge/subsonic/androidapp/domain/User.java (revision 0) +@@ -0,0 +1,43 @@ ++/* ++ This file is part of Subsonic. ++ ++ Subsonic is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or ++ (at your option) any later version. ++ ++ Subsonic is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with Subsonic. If not, see . ++ ++ Copyright 2009 (C) Sindre Mehus ++ */ ++ ++package net.sourceforge.subsonic.androidapp.domain; ++ ++import java.io.Serializable; ++ ++/** ++ * @author meld0 ++ * ++ */ ++public class User implements Serializable{ ++ ++ //TODO implement missing user attributes ++ ++ private boolean jukeboxControl; ++ ++ public boolean isJukeboxControl() { ++ return jukeboxControl; ++ } ++ ++ public void setJukeboxControl(boolean jukeboxControl) { ++ this.jukeboxControl = jukeboxControl; ++ } ++ ++ ++} +Index: src/net/sourceforge/subsonic/androidapp/service/CachedMusicService.java +=================================================================== +--- src/net/sourceforge/subsonic/androidapp/service/CachedMusicService.java (revision 2441) ++++ src/net/sourceforge/subsonic/androidapp/service/CachedMusicService.java (working copy) +@@ -21,9 +21,11 @@ + import android.content.Context; + import android.graphics.Bitmap; + import net.sourceforge.subsonic.androidapp.domain.Indexes; ++import net.sourceforge.subsonic.androidapp.domain.Jukebox; + import net.sourceforge.subsonic.androidapp.domain.MusicDirectory; + import net.sourceforge.subsonic.androidapp.domain.MusicFolder; + import net.sourceforge.subsonic.androidapp.domain.Playlist; ++import net.sourceforge.subsonic.androidapp.domain.User; + import net.sourceforge.subsonic.androidapp.domain.Version; + import net.sourceforge.subsonic.androidapp.domain.SearchResult; + import net.sourceforge.subsonic.androidapp.domain.SearchCritera; +@@ -199,4 +201,17 @@ + restUrl = newUrl; + } + } ++ ++ @Override ++ public Jukebox getJukebox(Jukebox jukebox, Context context, ++ ProgressListener progressListener, String action) throws Exception { ++ return musicService.getJukebox(jukebox, context, progressListener, action); ++ } ++ ++ @Override ++ public User getUser(Context context, ProgressListener progressListener) ++ throws Exception { ++ return musicService.getUser(context, progressListener); ++ } ++ + } +Index: src/net/sourceforge/subsonic/androidapp/service/MusicService.java +=================================================================== +--- src/net/sourceforge/subsonic/androidapp/service/MusicService.java (revision 2441) ++++ src/net/sourceforge/subsonic/androidapp/service/MusicService.java (working copy) +@@ -21,9 +21,11 @@ + import android.content.Context; + import android.graphics.Bitmap; + import net.sourceforge.subsonic.androidapp.domain.Indexes; ++import net.sourceforge.subsonic.androidapp.domain.Jukebox; + import net.sourceforge.subsonic.androidapp.domain.MusicDirectory; + import net.sourceforge.subsonic.androidapp.domain.MusicFolder; + import net.sourceforge.subsonic.androidapp.domain.Playlist; ++import net.sourceforge.subsonic.androidapp.domain.User; + import net.sourceforge.subsonic.androidapp.domain.Version; + import net.sourceforge.subsonic.androidapp.domain.SearchResult; + import net.sourceforge.subsonic.androidapp.domain.SearchCritera; +@@ -74,4 +76,8 @@ + Version getLatestVersion(Context context, ProgressListener progressListener) throws Exception; + + String getVideoUrl(Context context, String id); ++ ++ Jukebox getJukebox(Jukebox jukebox, Context context, ProgressListener progressListener , String action) throws Exception; ++ ++ User getUser(Context context, ProgressListener progressListener) throws Exception; + } +\ No newline at end of file +Index: src/net/sourceforge/subsonic/androidapp/service/RESTMusicService.java +=================================================================== +--- src/net/sourceforge/subsonic/androidapp/service/RESTMusicService.java (revision 2441) ++++ src/net/sourceforge/subsonic/androidapp/service/RESTMusicService.java (working copy) +@@ -28,6 +28,7 @@ + import android.util.Log; + import net.sourceforge.subsonic.androidapp.R; + import net.sourceforge.subsonic.androidapp.domain.Indexes; ++import net.sourceforge.subsonic.androidapp.domain.Jukebox; + import net.sourceforge.subsonic.androidapp.domain.Lyrics; + import net.sourceforge.subsonic.androidapp.domain.MusicDirectory; + import net.sourceforge.subsonic.androidapp.domain.MusicFolder; +@@ -35,10 +36,12 @@ + import net.sourceforge.subsonic.androidapp.domain.SearchCritera; + import net.sourceforge.subsonic.androidapp.domain.SearchResult; + import net.sourceforge.subsonic.androidapp.domain.ServerInfo; ++import net.sourceforge.subsonic.androidapp.domain.User; + import net.sourceforge.subsonic.androidapp.domain.Version; + import net.sourceforge.subsonic.androidapp.service.parser.AlbumListParser; + import net.sourceforge.subsonic.androidapp.service.parser.ErrorParser; + import net.sourceforge.subsonic.androidapp.service.parser.IndexesParser; ++import net.sourceforge.subsonic.androidapp.service.parser.JukeboxParser; + import net.sourceforge.subsonic.androidapp.service.parser.LicenseParser; + import net.sourceforge.subsonic.androidapp.service.parser.LyricsParser; + import net.sourceforge.subsonic.androidapp.service.parser.MusicDirectoryParser; +@@ -48,6 +51,7 @@ + import net.sourceforge.subsonic.androidapp.service.parser.RandomSongsParser; + import net.sourceforge.subsonic.androidapp.service.parser.SearchResult2Parser; + import net.sourceforge.subsonic.androidapp.service.parser.SearchResultParser; ++import net.sourceforge.subsonic.androidapp.service.parser.UserParser; + import net.sourceforge.subsonic.androidapp.service.parser.VersionParser; + import net.sourceforge.subsonic.androidapp.service.ssl.SSLSocketFactory; + import net.sourceforge.subsonic.androidapp.service.ssl.TrustSelfSignedStrategy; +@@ -195,6 +199,53 @@ + Util.close(reader); + } + } ++ ++ public Jukebox getJukebox(Jukebox jukebox, Context context, ProgressListener progressListener, String action) throws Exception { ++ ++ List parameterNames = new ArrayList(); ++ List