From 694b3b734f8b1cddb323b29e74929a35bb5cd9ef Mon Sep 17 00:00:00 2001 From: Mohamed Tarek Date: Fri, 22 May 2009 19:51:36 +0000 Subject: -Remove some unnecessary defines from rm.c. -Modify code related to the renamed rm.[c/h] instead of rm2wav.[c/h]. -Remove struct cook_extradata from rm.c as it is not used. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21041 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libcook/rm.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'apps/codecs/libcook/rm.c') diff --git a/apps/codecs/libcook/rm.c b/apps/codecs/libcook/rm.c index f2e9635bfc..92b6428462 100644 --- a/apps/codecs/libcook/rm.c +++ b/apps/codecs/libcook/rm.c @@ -27,11 +27,7 @@ #include #include -#include "rm2wav.h" - -#define MAX_PATH 260 -#define PKT_HEADER_SIZE 12 -#define RAW_AUDIO_DATA packet_length-PKT_HEADER_SIZE +#include "rm.h" #if 0 @@ -40,23 +36,8 @@ #else #define DEBUGF(...) #endif - -/* ASF codec IDs */ -#define CODEC_ID_WMAV1 0x160 -#define CODEC_ID_WMAV2 0x161 /* Some Rockbox-like functions (these should be implemented in metadata_common.[ch] */ -struct cook_extradata { - uint32_t cook_version; - uint16_t samples_pf_pc; /* samples per frame per channel */ - uint16_t nb_subbands; /* number of subbands in the frequency domain */ - - /* extra 8 bytes for stereo data */ - uint32_t unused; - uint16_t js_subband_start; /* joint stereo subband start */ - uint16_t js_vlc_bits; -}; - static int read_uint8(int fd, uint8_t* buf) { unsigned char tmp[1]; -- cgit v1.2.3