View Single Post
  #4 (permalink)  
Old May 1st, 2002
Unregistered
Guest
 
Posts: n/a
Default

diff -r qtella-0.5.2/include/AudioMp3.h qtella-mod/include/AudioMp3.h
9a10
> using namespace std;
diff -r qtella-0.5.2/include/RiffFile.h qtella-mod/include/RiffFile.h
8a9
> using namespace std;
diff -r qtella-0.5.2/src/AudioMp3.cpp qtella-mod/src/AudioMp3.cpp
10a11,12
> #include <iostream>
> #include <iomanip>
24a27
> using namespace std;
167c170
< file.open( filename, (ios::in | ios::bin) );
---
> file.open( filename, (ios_base::in | ios_base::binary) );
327c330
< unsigned char buffer[FRAME_HEADER_SIZE];
---
> char buffer[FRAME_HEADER_SIZE];
330c333
< if( !file.read(&buffer, FRAME_HEADER_SIZE) )
---
> if( !file.read(buffer, FRAME_HEADER_SIZE) )
447c450
< file.read( id3.genre, 1 );
---
> file.read( (char*)id3.genre, 1 );
diff -r qtella-0.5.2/src/AudioOgg.cpp qtella-mod/src/AudioOgg.cpp
14a15
> #include <iostream>
diff -r qtella-0.5.2/src/AudioWav.cpp qtella-mod/src/AudioWav.cpp
11a12,13
> #include <iostream>
> using namespace std;
diff -r qtella-0.5.2/src/RiffFile.cpp qtella-mod/src/RiffFile.cpp
58c58
< file.open(name, (ios::in|ios::bin));
---
> file.open(name, (ios_base::in|ios_base::binary));
264c264
< parent.filep()->read(&size, 4);
---
> parent.filep()->read((char*)size, 4);

not sure if I did this diff correctly.. (need to learn that utility better, been too comfortable with cvs diff
Reply With Quote