diff options
author | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-02-21 22:05:37 +0000 |
---|---|---|
committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-02-21 22:05:37 +0000 |
commit | e7a48977bf62a32f6fd055b72d9035310594a1d5 (patch) | |
tree | 3afe0656861ad4675a471078de9725b6fffb6c92 /apps/plugins/video.c | |
parent | a2861df3c2e634dc6a1eded0e2fe3b097b295de0 (diff) | |
download | rockbox-e7a48977bf62a32f6fd055b72d9035310594a1d5.tar.gz rockbox-e7a48977bf62a32f6fd055b72d9035310594a1d5.zip |
mp3_play_init() removed, this was resetting the sound settings. Playback is the normal state anyhow, we could remove this function from the plugin API.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4312 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/video.c')
-rw-r--r-- | apps/plugins/video.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/plugins/video.c b/apps/plugins/video.c index 6650631c58..a44b9c6354 100644 --- a/apps/plugins/video.c +++ b/apps/plugins/video.c | |||
@@ -595,8 +595,11 @@ int PlayTick(int fd) | |||
595 | gPlay.bRefilling = false; | 595 | gPlay.bRefilling = false; |
596 | } | 596 | } |
597 | 597 | ||
598 | if (!gPlay.bRefilling) | 598 | if (!gPlay.bRefilling |
599 | && rb->global_settings->disk_spindown < 20) // condition for test only | ||
600 | { | ||
599 | rb->ata_sleep(); // no point in leaving the disk run til timeout | 601 | rb->ata_sleep(); // no point in leaving the disk run til timeout |
602 | } | ||
600 | 603 | ||
601 | gBuf.pBufFill += got_now; | 604 | gBuf.pBufFill += got_now; |
602 | if (gBuf.pBufFill >= gBuf.pBufEnd) | 605 | if (gBuf.pBufFill >= gBuf.pBufEnd) |
@@ -832,8 +835,6 @@ int main(char* filename) | |||
832 | if (gFileHdr.audio_format == AUDIOFORMAT_MP3_BITSWAPPED) | 835 | if (gFileHdr.audio_format == AUDIOFORMAT_MP3_BITSWAPPED) |
833 | { | 836 | { |
834 | gPlay.bHasAudio = true; | 837 | gPlay.bHasAudio = true; |
835 | rb->mp3_play_init(); | ||
836 | rb->mpeg_sound_set(SOUND_VOLUME, rb->global_settings->volume); | ||
837 | } | 838 | } |
838 | 839 | ||
839 | // start playback by seeking to zero or resume position | 840 | // start playback by seeking to zero or resume position |