Redoing remiss's shout patch. This time, just block on open() instead of

pretending to play while we wait for the connection to timeout.  This
removes the need for timers, and thus removes the now unnecessary
timer_get_runtime_* function(s) from the timer code.

The changes made compared to the pre-patch shout plugin are:
* Block while connecting, timing out after 2 seconds.
* Close the device, and not just the connection, if play returns -1.
* Remove sd->last_err (it's always assigned before use).
* Some minor cleanups.

git-svn-id: https://svn.musicpd.org/mpd/trunk@6555 09075e82-0dd4-0310-85a5-a0d7c8717e4f

1 files changed, 1 insertions, 7 deletions

diff --git a/src/timer.c b/src/timer.c
index f9dfb1ab..0406a945 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -51,7 +51,7 @@ void timer_free(Timer *timer)
 
 void timer_start(Timer *timer)
 {
-	timer->start_time = timer->time = now();
+	timer->time = now();
 	timer->started = 1;
 }
 
@@ -59,7 +59,6 @@ void timer_reset(Timer *timer)
 {
 	timer->time = 0;
 	timer->started = 0;
-	timer->start_time = 0;
 }
 
 void timer_add(Timer *timer, int size)
@@ -79,8 +78,3 @@ void timer_sync(Timer *timer)
 	if (sleep > 0)
 		my_usleep(sleep);
 }
-
-uint64_t timer_get_runtime_us(Timer *timer) 
-{
-	return now() - timer->start_time;
-}