aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-30 22:59:36 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-30 23:01:51 +0800
commit2d4ca2150069139ab347bddce5a5c9264c1be3b1 (patch)
treecde66d750ca884b8052e266fb79de9eb00f42317
parente0469fa0914a13961878ef435c1c275819e04e65 (diff)
downloadgsoc2013-empathy-2d4ca2150069139ab347bddce5a5c9264c1be3b1.tar
gsoc2013-empathy-2d4ca2150069139ab347bddce5a5c9264c1be3b1.tar.gz
gsoc2013-empathy-2d4ca2150069139ab347bddce5a5c9264c1be3b1.tar.bz2
gsoc2013-empathy-2d4ca2150069139ab347bddce5a5c9264c1be3b1.tar.lz
gsoc2013-empathy-2d4ca2150069139ab347bddce5a5c9264c1be3b1.tar.xz
gsoc2013-empathy-2d4ca2150069139ab347bddce5a5c9264c1be3b1.tar.zst
gsoc2013-empathy-2d4ca2150069139ab347bddce5a5c9264c1be3b1.zip
Properly cast buffer and latency times when setting properties
This fix a crash on 32 bits system as gcc can't figure out the right size of the value. Thanks to Raluca-Elena Podiuc for her help in debugging this. https://bugzilla.gnome.org/show_bug.cgi?id=665171
-rw-r--r--src/empathy-audio-sink.c5
-rw-r--r--src/empathy-audio-src.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c
index 5ab14b541..d88555fe5 100644
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -222,7 +222,10 @@ create_sink (EmpathyGstAudioSink *self)
/* Set latency (buffering on the PulseAudio side) of 40ms and transfer data
* in 10ms chunks */
- g_object_set (sink, "buffer-time", 40000, "latency-time", 10000, NULL);
+ g_object_set (sink,
+ "buffer-time", (gint64) 40000,
+ "latency-time", (gint64) 10000,
+ NULL);
return sink;
}
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index aa271fa1c..9a882c146 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -332,7 +332,7 @@ create_src (void)
empathy_call_set_stream_properties (src, TRUE);
/* Set latency (buffering on the PulseAudio side) of 20ms */
- g_object_set (src, "buffer-time", 20000, NULL);
+ g_object_set (src, "buffer-time", (gint64) 20000, NULL);
return src;
}