Mercurial > otakunoraifu
comparison music2/wavfile.cc @ 47:5f548e5957a8
* get rid of the "deprecated conversion from string constant to ‘char*’" warnings
author | thib |
---|---|
date | Wed, 15 Apr 2009 20:26:32 +0000 |
parents | 3a6aaeab7b4e |
children | ed6c21dde840 |
comparison
equal
deleted
inserted
replaced
46:3aa3d244ad90 | 47:5f548e5957a8 |
---|---|
103 u_long nDataBytes ; | 103 u_long nDataBytes ; |
104 } WAVE_HEADER ; | 104 } WAVE_HEADER ; |
105 | 105 |
106 | 106 |
107 static void waveFormatCopy( WAVEFORMAT* wav, char *ptr ); | 107 static void waveFormatCopy( WAVEFORMAT* wav, char *ptr ); |
108 static char* findchunk (char* s1, char* s2, size_t n) ; | 108 static char* findchunk (char* s1, const char* s2, size_t n) ; |
109 | 109 |
110 static int WaveHeaderCheck (char *wave_buf,int* channels, u_long* samplerate, int* samplebits, u_long* samples,u_long* datastart) | 110 static int WaveHeaderCheck (char *wave_buf,int* channels, u_long* samplerate, int* samplebits, u_long* samples,u_long* datastart) |
111 { | 111 { |
112 static WAVEFORMAT waveformat ; | 112 static WAVEFORMAT waveformat ; |
113 char* ptr ; | 113 char* ptr ; |
174 | 174 |
175 return 0 ; | 175 return 0 ; |
176 } ; /* WaveHeaderCheck*/ | 176 } ; /* WaveHeaderCheck*/ |
177 | 177 |
178 | 178 |
179 static char* findchunk (char* pstart, char* fourcc, size_t n) | 179 static char* findchunk (char* pstart, const char* fourcc, size_t n) |
180 { char *pend ; | 180 { char *pend ; |
181 int k, test ; | 181 int k, test ; |
182 | 182 |
183 pend = pstart + n ; | 183 pend = pstart + n ; |
184 | 184 |