aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-08-09 21:42:24 +0100
committerConor Curran <conor.curran@canonical.com>2010-08-09 21:42:24 +0100
commit161d2b1e2d2ca940a37b97627e32b6bb074eaf76 (patch)
tree36a2cfe6114aba744841bcebd4a939cf5a768457
parente5a739d750c38bdcb1eb033fc9749f1228d9286c (diff)
downloadayatana-indicator-sound-161d2b1e2d2ca940a37b97627e32b6bb074eaf76.tar.gz
ayatana-indicator-sound-161d2b1e2d2ca940a37b97627e32b6bb074eaf76.tar.bz2
ayatana-indicator-sound-161d2b1e2d2ca940a37b97627e32b6bb074eaf76.zip
vala dbus issues resolved
-rw-r--r--src/Makefile.am1
-rw-r--r--src/mpris2-controller.vala46
2 files changed, 18 insertions, 29 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 0f2962a..0e22fe4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,6 +72,7 @@ music_bridge_VALASOURCES = \
music_bridge_VALAFLAGS = \
--ccode \
+ --disable-dbus-transformation \
-H music-player-bridge.h -d . \
--vapidir=$(top_srcdir)/vapi/ \
--vapidir=./ \
diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala
index 4555fca..750f69a 100644
--- a/src/mpris2-controller.vala
+++ b/src/mpris2-controller.vala
@@ -19,26 +19,22 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
*/
using Gee;
-/*struct Status {
- public int32 playback;
- public double shuffle;
- public bool repeat;
- public bool endless;
- public bool endlessy;
-}*/
-[DBus (name = "org.mpris.mediaplayers.vlc")]
+[DBus (name = "org.mpris.MediaPlayer.Player")]
public interface MprisPlayer : Object {
- public abstract struct Status {
+ public struct Status {
public int32 Playback_State;
public double Playback_Rate;
public bool Repeat_State;
public bool Shuffle_State;
public bool Endless_State;
}
+ public abstract void PlayPause() throws DBus.Error;
+ public abstract void Pause() throws DBus.Error;
+ public abstract void Next() throws DBus.Error;
+ public abstract void Previous() throws DBus.Error;
-
- //public abstract struct Status () throws DBus.Error;
+ public abstract signal void StatusChanged(Status update);
}
/*
@@ -51,14 +47,6 @@ public class Mpris2Controller : GLib.Object
public dynamic DBus.Object mpris2_root {get; construct;}
public MprisPlayer mpris2_player {get; construct;}
public PlayerController owner {get; construct;}
-
- /*struct status {
- public int32 Playback_State;
- public double Playback_Rate;
- public bool Repeat_State;
- public bool Shuffle_State;
- public bool Endless_State;
- }*/
public Mpris2Controller(PlayerController ctrl)
{
@@ -80,7 +68,7 @@ public class Mpris2Controller : GLib.Object
"/org/mpris/MediaPlayer/Player",
"org.mpris.MediaPlayer.Player");
//this.mpris2_player.TrackChange += onTrackChange;
- //this.mpris2_player.StatusChange += onStatusChange;
+ this.mpris2_player.StatusChanged += onStatusChanged;
initial_update();
}
@@ -106,20 +94,18 @@ public class Mpris2Controller : GLib.Object
}
public void transport_event(TransportMenuitem.action command)
- {
- /*
+ {
debug("transport_event input = %i", (int)command);
if(command == TransportMenuitem.action.PLAY_PAUSE){
debug("transport_event PLAY_PAUSE");
- this.mpris2_player.Pause();
+ this.mpris2_player.PlayPause();
}
else if(command == TransportMenuitem.action.PREVIOUS){
- this.mpris2_player.Prev();
+ this.mpris2_player.Previous();
}
else if(command == TransportMenuitem.action.NEXT){
this.mpris2_player.Next();
- }
- */
+ }
}
public void set_position(double position)
@@ -147,8 +133,10 @@ public class Mpris2Controller : GLib.Object
return (this.mpris2_player != null);
}
- //private void onStatusChange(dynamic DBus.Object mpris_client, status st)
- //{
+ private void onStatusChanged(MprisPlayer.Status st)
+ {
+ debug("on status changed - fucking jesus mother of god");
+ debug("new playback state = %i", st.Playback_State);
/*
debug("onStatusChange - signal received");
status* status = &st;
@@ -162,7 +150,7 @@ public class Mpris2Controller : GLib.Object
this.owner.custom_items[PlayerController.widget_order.TRANSPORT].update(ht, TransportMenuitem.attributes_format());
this.owner.custom_items[PlayerController.widget_order.SCRUB].update(ht, ScrubMenuitem.attributes_format());
*/
- //}
+ }
private void onTrackChange(dynamic DBus.Object mpris_client, HashTable<string,Value?> ht)
{