Mercurial > hg > svcore
comparison data/fileio/OggVorbisFileReader.h @ 1359:1c9bbbb6116a 3.0-integration
Use W64 instead of WAV for decoded files; use Ogg reader in preference to WAV one for Ogg files (WAV reader works, via libsndfile, but doesn't load metadata); fix Ogg reader to use QFile open instead of non-Win32-compatible API; add more encoder tests, audio writer test, midi reader test
author | Chris Cannam |
---|---|
date | Tue, 10 Jan 2017 10:58:25 +0000 |
parents | abc309f507ae |
children | c01cbe41aeb5 |
comparison
equal
deleted
inserted
replaced
1358:b7be05d57f0a | 1359:1c9bbbb6116a |
---|---|
11 published by the Free Software Foundation; either version 2 of the | 11 published by the Free Software Foundation; either version 2 of the |
12 License, or (at your option) any later version. See the file | 12 License, or (at your option) any later version. See the file |
13 COPYING included with this distribution for more information. | 13 COPYING included with this distribution for more information. |
14 */ | 14 */ |
15 | 15 |
16 #ifndef _OGG_VORBIS_FILE_READER_H_ | 16 #ifndef SV_OGG_VORBIS_FILE_READER_H |
17 #define _OGG_VORBIS_FILE_READER_H_ | 17 #define SV_OGG_VORBIS_FILE_READER_H |
18 | 18 |
19 #ifdef HAVE_OGGZ | 19 #ifdef HAVE_OGGZ |
20 #ifdef HAVE_FISHSOUND | 20 #ifdef HAVE_FISHSOUND |
21 | 21 |
22 #include "CodedAudioFileReader.h" | 22 #include "CodedAudioFileReader.h" |
23 | 23 |
24 #include "base/Thread.h" | 24 #include "base/Thread.h" |
25 #include <oggz/oggz.h> | 25 #include <oggz/oggz.h> |
26 #include <fishsound/fishsound.h> | 26 #include <fishsound/fishsound.h> |
27 | |
28 #include <cstdio> | |
27 | 29 |
28 #include <set> | 30 #include <set> |
29 | 31 |
30 class ProgressReporter; | 32 class ProgressReporter; |
31 | 33 |
69 QString m_error; | 71 QString m_error; |
70 QString m_title; | 72 QString m_title; |
71 QString m_maker; | 73 QString m_maker; |
72 TagMap m_tags; | 74 TagMap m_tags; |
73 | 75 |
76 QFile *m_qfile; | |
77 FILE *m_ffile; | |
74 OGGZ *m_oggz; | 78 OGGZ *m_oggz; |
75 FishSound *m_fishSound; | 79 FishSound *m_fishSound; |
76 ProgressReporter *m_reporter; | 80 ProgressReporter *m_reporter; |
77 sv_frame_t m_fileSize; | 81 sv_frame_t m_fileSize; |
78 sv_frame_t m_bytesRead; | 82 sv_frame_t m_bytesRead; |