diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2006-07-29 17:39:55 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2006-07-29 17:39:55 +0000 |
commit | 2fa682535bc559bddf806ab0be3df2bd7693b140 (patch) | |
tree | 650bff48cf34af4805edc43ae004c2598435538f | |
parent | d43bff987ac3e0991802853192b447d5ebee64e0 (diff) | |
download | rockbox-2fa682535bc559bddf806ab0be3df2bd7693b140.tar.gz rockbox-2fa682535bc559bddf806ab0be3df2bd7693b140.zip |
Oops, committed some extra stuff not necessary.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10362 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/playback.c | 12 |
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 { | |||
177 | 177 | ||
178 | 178 | ||
179 | static struct mutex mutex_codecthread; | 179 | static struct mutex mutex_codecthread; |
180 | static struct mutex mutex_buffering; | ||
181 | static struct event_queue codec_callback_queue; | 180 | static struct event_queue codec_callback_queue; |
182 | 181 | ||
183 | static struct mp3entry id3_voice; | 182 | static struct mp3entry id3_voice; |
@@ -831,15 +830,11 @@ static bool buffer_wind_forward(int new_track_ridx, int old_track_ridx) | |||
831 | { | 830 | { |
832 | size_t amount; | 831 | size_t amount; |
833 | 832 | ||
834 | mutex_lock(&mutex_buffering); | ||
835 | |||
836 | /* Start with the remainder of the previously playing track */ | 833 | /* Start with the remainder of the previously playing track */ |
837 | amount = tracks[old_track_ridx].filesize - ci.curpos; | 834 | amount = tracks[old_track_ridx].filesize - ci.curpos; |
838 | /* Then collect all data from tracks in between them */ | 835 | /* Then collect all data from tracks in between them */ |
839 | amount += buffer_count_tracks(old_track_ridx, new_track_ridx); | 836 | amount += buffer_count_tracks(old_track_ridx, new_track_ridx); |
840 | 837 | ||
841 | mutex_unlock(&mutex_buffering); | ||
842 | |||
843 | if (amount > filebufused) | 838 | if (amount > filebufused) |
844 | return false; | 839 | return false; |
845 | 840 | ||
@@ -863,8 +858,6 @@ static bool buffer_wind_backward(int new_track_ridx, int old_track_ridx) | |||
863 | /* Start with the previously playing track's data and our data */ | 858 | /* Start with the previously playing track's data and our data */ |
864 | size_t amount; | 859 | size_t amount; |
865 | 860 | ||
866 | mutex_lock(&mutex_buffering); | ||
867 | |||
868 | buf_back = buf_ridx; | 861 | buf_back = buf_ridx; |
869 | amount = ci.curpos; | 862 | amount = ci.curpos; |
870 | if (buf_ridx < buf_widx) | 863 | if (buf_ridx < buf_widx) |
@@ -896,10 +889,7 @@ static bool buffer_wind_backward(int new_track_ridx, int old_track_ridx) | |||
896 | 889 | ||
897 | /* Do we have space to make this skip? */ | 890 | /* Do we have space to make this skip? */ |
898 | if (amount > buf_back) | 891 | if (amount > buf_back) |
899 | { | ||
900 | mutex_unlock(&mutex_buffering); | ||
901 | return false; | 892 | return false; |
902 | } | ||
903 | 893 | ||
904 | logf("bwb:%ldB",amount); | 894 | logf("bwb:%ldB",amount); |
905 | 895 | ||
@@ -912,7 +902,6 @@ static bool buffer_wind_backward(int new_track_ridx, int old_track_ridx) | |||
912 | 902 | ||
913 | /* Reset to the beginning of the new track */ | 903 | /* Reset to the beginning of the new track */ |
914 | tracks[new_track_ridx].available = tracks[new_track_ridx].filesize; | 904 | tracks[new_track_ridx].available = tracks[new_track_ridx].filesize; |
915 | mutex_unlock(&mutex_buffering); | ||
916 | 905 | ||
917 | return true; | 906 | return true; |
918 | } | 907 | } |
@@ -3070,7 +3059,6 @@ void audio_preinit(void) | |||
3070 | cur_ti = &tracks[0]; | 3059 | cur_ti = &tracks[0]; |
3071 | 3060 | ||
3072 | mutex_init(&mutex_codecthread); | 3061 | mutex_init(&mutex_codecthread); |
3073 | mutex_init(&mutex_buffering); | ||
3074 | 3062 | ||
3075 | queue_init(&audio_queue); | 3063 | queue_init(&audio_queue); |
3076 | queue_init(&codec_queue); | 3064 | queue_init(&codec_queue); |