[PATCH] Whitespace cleanups.

[Felipe Contreras]

Signed-off-by: Felipe Contreras <felipe.c...@gmail.com>
---
src/audio-player.vala | 11 +++++------
src/epr.vala | 2 +-
src/epris-player.vala | 2 +-
src/epris.vala | 2 +-
4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/audio-player.vala b/src/audio-player.vala
index 8f6d2f6..c184fd8 100644
--- a/src/audio-player.vala
+++ b/src/audio-player.vala
@@ -32,8 +32,8 @@ public class AudioPlayer: GLib.Object {

Pipeline? pipeline;
Element? src;
- Element? decodebin;
- Element? sink;
+ Element? decodebin;
+ Element? sink;

bool bus_func (Gst.Bus bus, Gst.Message message) {
switch (message.type) {
@@ -156,9 +156,9 @@ public class AudioPlayer: GLib.Object {
if (pipeline != null)
pipeline.set_state (Gst.State.PLAYING);

- return true;
+ return true;

- case EprisPlayer.State.STOPPED:
+ case EprisPlayer.State.STOPPED:

if (pipeline != null) {
pipeline.set_state (Gst.State.NULL);
@@ -166,10 +166,9 @@ public class AudioPlayer: GLib.Object {
}

return true;
+
default:
return false;
}
}
}
-
-
diff --git a/src/epr.vala b/src/epr.vala
index eb8d697..58aaa60 100644
--- a/src/epr.vala
+++ b/src/epr.vala
@@ -349,4 +349,4 @@ Available commands:
}
}

-}
\ No newline at end of file
+}
diff --git a/src/epris-player.vala b/src/epris-player.vala
index b5c03dc..837ab59 100644
--- a/src/epris-player.vala
+++ b/src/epris-player.vala
@@ -94,4 +94,4 @@ namespace EprisPlayer {
}
}

-}
\ No newline at end of file
+}
diff --git a/src/epris.vala b/src/epris.vala
index 945e1c2..2e8e9fe 100644
--- a/src/epris.vala
+++ b/src/epris.vala
@@ -202,4 +202,4 @@ class Epris: EprisPlayer.Service {
return epris.run ();
}

-}
\ No newline at end of file
+}
--
1.6.0.1

[Felipe Contreras]

Signed-off-by: Felipe Contreras <felipe.c...@gmail.com>
---

src/epr.vala | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/epr.vala b/src/epr.vala
index 58aaa60..c7e4f4f 100644
--- a/src/epr.vala
+++ b/src/epr.vala
@@ -128,6 +128,7 @@ class Epr: GLib.Object {
{ null }
};
int cmd_play (string[] args) throws GLib.Error {
+ debug ("cmd play");
var opt_context = new OptionContext ("- Manage Epris audio player");
opt_context.add_main_entries (play_options, null);

@@ -140,6 +141,7 @@ class Epr: GLib.Object {
}

int cmd_stop (string[] args) throws GLib.Error {
+ debug ("cmd stop");
stop ();

return 0;
--
1.6.0.1

[Felipe Contreras]

This is needed for delicate audiosinks.

Signed-off-by: Felipe Contreras <felipe.c...@gmail.com>
---

src/audio-player.vala | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/audio-player.vala b/src/audio-player.vala
index c184fd8..25b97f0 100644
--- a/src/audio-player.vala
+++ b/src/audio-player.vala
@@ -33,6 +33,7 @@ public class AudioPlayer: GLib.Object {
Pipeline? pipeline;
Element? src;
Element? decodebin;
+ Element? convert;

Element? sink;

bool bus_func (Gst.Bus bus, Gst.Message message) {

@@ -105,7 +106,7 @@ public class AudioPlayer: GLib.Object {
}

void decoded_pad (Pad pad, bool arg1, void* data) {
- pad.link (sink.get_static_pad ("sink"));
+ pad.link (convert.get_static_pad ("sink"));
}

void setup_pipeline () {
@@ -119,14 +120,17 @@ public class AudioPlayer: GLib.Object {
pipeline.get_bus ().add_watch (bus_func);

decodebin = ElementFactory.make ("decodebin2", "decodebin");
+ convert = ElementFactory.make ("audioconvert", "convert");
sink = ElementFactory.make ("autoaudiosink", "audiosink");

// addmany is broken with vala
pipeline.add (src);
+ pipeline.add (convert);
pipeline.add (sink);
pipeline.add (decodebin);

src.link (decodebin);
+ convert.link (sink);

decodebin.connect ("swapped-object-signal::new-decoded-pad", decoded_pad, this);
}
--
1.6.0.1

[Marc-André Lureau]

thanks, applied

--
Marc-André Lureau

[Marc-André Lureau]

thanks, applied!
--
Marc-André Lureau