summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2006-07-29 17:39:55 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2006-07-29 17:39:55 +0000
commit2fa682535bc559bddf806ab0be3df2bd7693b140 (patch)
tree650bff48cf34af4805edc43ae004c2598435538f /apps
parentd43bff987ac3e0991802853192b447d5ebee64e0 (diff)
Oops, committed some extra stuff not necessary.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10362 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/playback.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/apps/playback.c b/apps/playback.c
index 16e1e1c24c..56809fbbf0 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -177,7 +177,6 @@ struct voice_info {
static struct mutex mutex_codecthread;
-static struct mutex mutex_buffering;
static struct event_queue codec_callback_queue;
static struct mp3entry id3_voice;
@@ -831,15 +830,11 @@ static bool buffer_wind_forward(int new_track_ridx, int old_track_ridx)
{
size_t amount;
- mutex_lock(&mutex_buffering);
-
/* Start with the remainder of the previously playing track */
amount = tracks[old_track_ridx].filesize - ci.curpos;
/* Then collect all data from tracks in between them */
amount += buffer_count_tracks(old_track_ridx, new_track_ridx);
- mutex_unlock(&mutex_buffering);
-
if (amount > filebufused)
return false;
@@ -863,8 +858,6 @@ static bool buffer_wind_backward(int new_track_ridx, int old_track_ridx)
/* Start with the previously playing track's data and our data */
size_t amount;
- mutex_lock(&mutex_buffering);
-
buf_back = buf_ridx;
amount = ci.curpos;
if (buf_ridx < buf_widx)
@@ -896,10 +889,7 @@ static bool buffer_wind_backward(int new_track_ridx, int old_track_ridx)
/* Do we have space to make this skip? */
if (amount > buf_back)
- {
- mutex_unlock(&mutex_buffering);
return false;
- }
logf("bwb:%ldB",amount);
@@ -912,7 +902,6 @@ static bool buffer_wind_backward(int new_track_ridx, int old_track_ridx)
/* Reset to the beginning of the new track */
tracks[new_track_ridx].available = tracks[new_track_ridx].filesize;
- mutex_unlock(&mutex_buffering);
return true;
}
@@ -3070,7 +3059,6 @@ void audio_preinit(void)
cur_ti = &tracks[0];
mutex_init(&mutex_codecthread);
- mutex_init(&mutex_buffering);
queue_init(&audio_queue);
queue_init(&codec_queue);