Updating branch refs/heads/master
to 417d5faae3dbfa7ffddbe3bf535782a89c12a5bc (commit)
from 7ee577688c9ee4c4474ece84fc4dc779e2cfc6e7 (commit)
commit 417d5faae3dbfa7ffddbe3bf535782a89c12a5bc
Author: Mike Massonnet <[email protected]>
Date: Tue Feb 1 19:36:03 2011 +0100
Shut gcc warnings down against Vala compilation
src/interface.vala | 18 +++++++++---------
src/mpdclient.vapi | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/interface.vala b/src/interface.vala
index 4eb4db6..a7652ba 100644
--- a/src/interface.vala
+++ b/src/interface.vala
@@ -160,10 +160,10 @@ namespace Xfmpc {
if (time_total < 0)
return false;
- double time = event.x /
this.progress_bar.allocation.width;
- time *= time_total;
+ double song_time = event.x /
this.progress_bar.allocation.width;
+ song_time *= time_total;
- this.mpdclient.set_song_time ((int) time);
+ this.mpdclient.set_song_time ((int) song_time);
return true;
}
@@ -180,12 +180,12 @@ namespace Xfmpc {
GLib.Signal.emit_by_name (this.button_volume, "popup",
null);
}
- public void set_time (int time, int time_total) {
+ public void set_time (int song_time, int time_total) {
int min, sec, min_total, sec_total;
double fraction = 1.0;
- min = time / 60;
- sec = time % 60;
+ min = song_time / 60;
+ sec = song_time % 60;
min_total = time_total / 60;
sec_total = time_total % 60;
@@ -195,7 +195,7 @@ namespace Xfmpc {
this.progress_bar.set_text (text.str);
if (time_total > 0)
- fraction = (float)time / (float)time_total;
+ fraction = (float)song_time / (float)time_total;
this.progress_bar.set_fraction ((fraction <= 1.0) ?
fraction : 1.0);
}
@@ -241,8 +241,8 @@ namespace Xfmpc {
cb_song_changed ();
}
- private void cb_time_changed (int time) {
- set_time (time, mpdclient.get_total_time());
+ private void cb_time_changed (int song_time) {
+ set_time (song_time, mpdclient.get_total_time());
}
private void cb_total_time_changed (int total_time) {
diff --git a/src/mpdclient.vapi b/src/mpdclient.vapi
index bae52ee..918df11 100644
--- a/src/mpdclient.vapi
+++ b/src/mpdclient.vapi
@@ -48,7 +48,7 @@ namespace Xfmpc {
public bool set_repeat (bool repeat);
public bool set_single (bool single);
public bool set_consume (bool consume);
- public bool set_song_time (uint time);
+ public bool set_song_time (uint song_time);
public bool set_volume (uchar volume);
public bool stop ();
public void update_status ();
@@ -56,7 +56,7 @@ namespace Xfmpc {
public virtual signal void connected ();
public virtual signal void song_changed ();
public virtual signal void pp_changed (bool is_playing);
- public virtual signal void time_changed (int time);
+ public virtual signal void time_changed (int song_time);
public virtual signal void total_time_changed (int total_time);
public virtual signal void volume_changed (int volume);
public virtual signal void stopped ();
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
