diff options
| author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-11-20 11:58:11 +0000 |
|---|---|---|
| committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-11-20 11:58:11 +0000 |
| commit | e0b020fbfcadfbd4fbcb3ae7b5b5ea53992b404b (patch) | |
| tree | a8079b5561185219714842ff4af48f34ec9135be /apps/plugins/mpegplayer/mpegplayer.h | |
| parent | 475e68851de5fe097d5436a9e4f1063c79d4a1a6 (diff) | |
| download | rockbox-e0b020fbfcadfbd4fbcb3ae7b5b5ea53992b404b.zip rockbox-e0b020fbfcadfbd4fbcb3ae7b5b5ea53992b404b.tar.gz rockbox-e0b020fbfcadfbd4fbcb3ae7b5b5ea53992b404b.tar.bz2 rockbox-e0b020fbfcadfbd4fbcb3ae7b5b5ea53992b404b.tar.xz | |
Merge mpeg_malloc_reason_t and mpeg2_alloc_t, add STATE_INTERNAL_NORETURN to mpeg2_state_t, to fix warnings with short enums.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23677 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer/mpegplayer.h')
| -rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.h b/apps/plugins/mpegplayer/mpegplayer.h index 6247a6d..bf223c3 100644 --- a/apps/plugins/mpegplayer/mpegplayer.h +++ b/apps/plugins/mpegplayer/mpegplayer.h @@ -23,6 +23,8 @@ #ifndef MPEGPLAYER_H #define MPEGPLAYER_H +#include "mpeg2.h" + #ifdef HAVE_SCHEDULER_BOOSTCTRL #define trigger_cpu_boost rb->trigger_cpu_boost #define cancel_cpu_boost rb->cancel_cpu_boost @@ -32,17 +34,6 @@ /* Memory allotments for various subsystems */ #define MIN_MEMMARGIN (4*1024) -enum mpeg_malloc_reason_t -{ - __MPEG_ALLOC_FIRST = -256, - MPEG_ALLOC_CODEC_MALLOC, - MPEG_ALLOC_CODEC_CALLOC, - MPEG_ALLOC_MPEG2_BUFFER, - MPEG_ALLOC_AUDIOBUF, - MPEG_ALLOC_PCMOUT, - MPEG_ALLOC_DISKBUF, -}; - /** Video thread **/ #define LIBMPEG2_ALLOC_SIZE (2*1024*1024) |