diff options
| author | Conor Curran <conor.curran@canonical.com> | 2010-06-17 16:57:50 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2010-06-17 16:57:50 +0100 |
| commit | be955e01aa7792932d4b33e9419db48247f87756 (patch) | |
| tree | 67f303a85e39a842c523f3fc3ead040e1bfae826 | |
| parent | 0585eccbaa90e2d4eae447a5a69e1101c528d2c0 (diff) | |
| parent | fbc95f69319a6659ccf321eef370189072c4f279 (diff) | |
| download | ayatana-indicator-sound-be955e01aa7792932d4b33e9419db48247f87756.tar.gz ayatana-indicator-sound-be955e01aa7792932d4b33e9419db48247f87756.tar.bz2 ayatana-indicator-sound-be955e01aa7792932d4b33e9419db48247f87756.zip | |
Merged in branch tidy up
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/rhythmbox-controller.vala | 44 |
2 files changed, 2 insertions, 46 deletions
diff --git a/configure.ac b/configure.ac index 1478bec..2c58cc2 100644 --- a/configure.ac +++ b/configure.ac @@ -34,8 +34,8 @@ DBUSMENUGTK_REQUIRED_VERSION=0.2.2 POLKIT_REQUIRED_VERSION=0.92 PULSE_AUDIO_REQUIRED_VERSION=0.9.19 INDICATOR_DISPLAY_OBJECTS=0.1.4 -INDICATE_REQUIRED_VERSION=0.3.6 -DBUSMENUGLIB_REQUIRED_VERSION=0.2.9 +INDICATE_REQUIRED_VERSION=0.4.1 +DBUSMENUGLIB_REQUIRED_VERSION=0.3.1 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION diff --git a/src/rhythmbox-controller.vala b/src/rhythmbox-controller.vala deleted file mode 100644 index 734c8bd..0000000 --- a/src/rhythmbox-controller.vala +++ /dev/null @@ -1,44 +0,0 @@ -using DbusmenuGlib; - -public class RhythmboxController : GLib.Object -{ - private DBus.Connection connection; - private dynamic DBus.Object rhythmbox_player; - private dynamic DBus.Object rhythmbox_shell; - private dynamic DBus.Object rhythmbox_playlistmgr; - - public RhythmboxController() - { - try { - this.connection = DBus.Bus.get (DBus.BusType.SESSION); - } catch (Error e) { - debug("Problems connecting to the session bus - %s", e.message); - } - - this.rhythmbox_player = this.connection.get_object ("org.gnome.Rhythmbox", "/org/gnome/Rhythmbox/Player", "org.gnome.Rhythmbox.Player"); - this.rhythmbox_shell = connection.get_object ("org.gnome.Rhythmbox", "/org/gnome/Rhythmbox/Shell", "org.gnome.Rhythmbox.Shell"); - this.rhythmbox_playlistmgr = connection.get_object ("org.gnome.Rhythmbox", "/org/gnome/Rhythmbox/PlaylistManager", "/org/gnome/Rhythmbox/PlaylistManager"); - - this.rhythmbox_player.playingUriChanged += onUriChange; - this.rhythmbox_player.elapsedChanged += onElapsedChange; - - debug("New rhythmbox controller has been instantiated"); - } - - private void onUriChange(dynamic DBus.Object rhythmbox, string uri) - { - debug("onUriChange, new uri : %s", uri); - //;// = new HashTable<string, string>(str_hash,str_equal); - HashTable<string,Value?> ht = this.rhythmbox_shell.getSongProperties(uri); - var l = ht.get_keys(); - foreach(string s in l){ - debug("key = %s", s); - } - } - - private void onElapsedChange(dynamic DBus.Object rhythmbox, uint32 time) - { - debug("onElapsedChange, new time = %u", time); - } - -} |