diff options
| author | Conor Curran <conor.curran@canonical.com> | 2012-02-29 21:05:26 +0000 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2012-02-29 21:05:26 +0000 |
| commit | 5d56e1dc1ee21ec92028275690b5ce2f7595e68e (patch) | |
| tree | 56b9cdddbda6b273e98cc9cf726defec7beceb30 | |
| parent | 062aadf6d9ab7f1cecfab74159507047d52dc6d8 (diff) | |
| download | ayatana-indicator-sound-5d56e1dc1ee21ec92028275690b5ce2f7595e68e.tar.gz ayatana-indicator-sound-5d56e1dc1ee21ec92028275690b5ce2f7595e68e.tar.bz2 ayatana-indicator-sound-5d56e1dc1ee21ec92028275690b5ce2f7595e68e.zip | |
make sure to return if there is no valid playlist
| -rw-r--r-- | src/mpris2-controller.vala | 3 | ||||
| -rw-r--r-- | src/mpris2-interfaces.vala | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala index cc80a86..0fa7b6c 100644 --- a/src/mpris2-controller.vala +++ b/src/mpris2-controller.vala @@ -248,8 +248,7 @@ public class Mpris2Controller : GLib.Object private bool fetch_active_playlist() { if (this.playlists.ActivePlaylist.valid == false){ - // TODO - // What happens here ? + return false; } PlaylistsMenuitem playlists_item = this.owner.custom_items[PlayerController.widget_order.PLAYLISTS] as PlaylistsMenuitem; playlists_item.active_playlist_update ( this.playlists.ActivePlaylist.details ); diff --git a/src/mpris2-interfaces.vala b/src/mpris2-interfaces.vala index 5dab1d2..57b582d 100644 --- a/src/mpris2-interfaces.vala +++ b/src/mpris2-interfaces.vala @@ -49,9 +49,9 @@ public interface MprisPlayer : Object { // Playlist container public struct PlaylistDetails{ - public ObjectPath path; - public string name; - public string icon_path; + public ObjectPath? path; + public string? name; + public string? icon_path; } // Active playlist property container @@ -69,11 +69,11 @@ public interface MprisPlaylists : Object { //methods public abstract async void ActivatePlaylist(ObjectPath playlist_id) throws IOError; - public abstract async PlaylistDetails[] GetPlaylists ( uint32 index, + public abstract async PlaylistDetails[]? GetPlaylists ( int32 index, uint32 max_count, string order, bool reverse_order ) throws IOError; //signals public signal void PlaylistChanged (PlaylistDetails details); -}
\ No newline at end of file +} |