freebsd-ports/audio/gnomoradio/files/patch-roboradio-audio_prober.cc
Martin Wilke 25c606a18d - Fix build with gcc 4.2
- Pass maintainership to submitter

PR:		118464
Submitted by:	Pietro Cerutti <gahr@gahr.ch>
Approved by:	portmgr (erwin)
2007-12-10 22:47:28 +00:00

58 lines
1.3 KiB
C++

--- roboradio/audio/prober.cc.orig 2007-12-06 15:39:58.000000000 +0100
+++ roboradio/audio/prober.cc 2007-12-06 15:40:19.000000000 +0100
@@ -21,6 +21,30 @@
#include "../mp3/esd-audio.h"
}
+namespace Roboradio
+{
+ namespace Audio
+ {
+ gboolean probe (gpointer s)
+ {
+ Prober *sng = static_cast<Prober*>(s);
+ if (esdout_playing()) {
+ int pos = sng->get_position();
+ if (pos >= 0)
+ sng->signal_position_changed(pos);
+ return true;
+ } else if (sng->get_position() >= 0) {
+ return true;
+ } else {
+ sng->stop();
+ sng->signal_done();
+ sng->activated = false;
+ return false;
+ }
+ }
+ }
+}
+
Roboradio::Audio::Prober::Prober ()
: activated(false)
{
@@ -31,24 +55,6 @@
stop_prober();
}
-gboolean Roboradio::Audio::probe (gpointer s)
-{
- Prober *sng = static_cast<Prober*>(s);
- if (esdout_playing()) {
- int pos = sng->get_position();
- if (pos >= 0)
- sng->signal_position_changed(pos);
- return true;
- } else if (sng->get_position() >= 0) {
- return true;
- } else {
- sng->stop();
- sng->signal_done();
- sng->activated = false;
- return false;
- }
-}
-
void Roboradio::Audio::Prober::start_prober ()
{
if (activated)