comparison data/fileio/OggVorbisFileReader.cpp @ 1582:70e172e6cc59 fix-static-analysis

Use nullptr throughout
author Chris Cannam
date Mon, 26 Nov 2018 14:33:41 +0000
parents ce08318aad83
children
comparison
equal deleted inserted replaced
1581:ad5f892c0c4d 1582:70e172e6cc59
38 bool normalised, 38 bool normalised,
39 ProgressReporter *reporter) : 39 ProgressReporter *reporter) :
40 CodedAudioFileReader(mode, targetRate, normalised), 40 CodedAudioFileReader(mode, targetRate, normalised),
41 m_source(source), 41 m_source(source),
42 m_path(source.getLocalFilename()), 42 m_path(source.getLocalFilename()),
43 m_qfile(0), 43 m_qfile(nullptr),
44 m_ffile(0), 44 m_ffile(nullptr),
45 m_oggz(0), 45 m_oggz(nullptr),
46 m_fishSound(0), 46 m_fishSound(nullptr),
47 m_reporter(reporter), 47 m_reporter(reporter),
48 m_fileSize(0), 48 m_fileSize(0),
49 m_bytesRead(0), 49 m_bytesRead(0),
50 m_commentsRead(false), 50 m_commentsRead(false),
51 m_cancelled(false), 51 m_cancelled(false),
52 m_completion(0), 52 m_completion(0),
53 m_decodeThread(0) 53 m_decodeThread(nullptr)
54 { 54 {
55 SVDEBUG << "OggVorbisFileReader: local path: \"" << m_path 55 SVDEBUG << "OggVorbisFileReader: local path: \"" << m_path
56 << "\", decode mode: " << decodeMode << " (" 56 << "\", decode mode: " << decodeMode << " ("
57 << (decodeMode == DecodeAtOnce ? "DecodeAtOnce" : "DecodeThreaded") 57 << (decodeMode == DecodeAtOnce ? "DecodeAtOnce" : "DecodeThreaded")
58 << ")" << endl; 58 << ")" << endl;
70 m_qfile = new QFile(m_path); 70 m_qfile = new QFile(m_path);
71 if (!m_qfile->open(QIODevice::ReadOnly)) { 71 if (!m_qfile->open(QIODevice::ReadOnly)) {
72 m_error = QString("Failed to open file %1 for reading.").arg(m_path); 72 m_error = QString("Failed to open file %1 for reading.").arg(m_path);
73 SVDEBUG << "OggVorbisFileReader: " << m_error << endl; 73 SVDEBUG << "OggVorbisFileReader: " << m_error << endl;
74 delete m_qfile; 74 delete m_qfile;
75 m_qfile = 0; 75 m_qfile = nullptr;
76 return; 76 return;
77 } 77 }
78 78
79 m_fileSize = m_qfile->size(); 79 m_fileSize = m_qfile->size();
80 80
81 m_ffile = fdopen(dup(m_qfile->handle()), "rb"); 81 m_ffile = fdopen(dup(m_qfile->handle()), "rb");
82 if (!m_ffile) { 82 if (!m_ffile) {
83 m_error = QString("Failed to open file pointer for file %1").arg(m_path); 83 m_error = QString("Failed to open file pointer for file %1").arg(m_path);
84 SVDEBUG << "OggVorbisFileReader: " << m_error << endl; 84 SVDEBUG << "OggVorbisFileReader: " << m_error << endl;
85 delete m_qfile; 85 delete m_qfile;
86 m_qfile = 0; 86 m_qfile = nullptr;
87 return; 87 return;
88 } 88 }
89 89
90 if (!(m_oggz = oggz_open_stdio(m_ffile, OGGZ_READ))) { 90 if (!(m_oggz = oggz_open_stdio(m_ffile, OGGZ_READ))) {
91 m_error = QString("File %1 is not an OGG file.").arg(m_path); 91 m_error = QString("File %1 is not an OGG file.").arg(m_path);
92 fclose(m_ffile); 92 fclose(m_ffile);
93 m_ffile = 0; 93 m_ffile = nullptr;
94 delete m_qfile; 94 delete m_qfile;
95 m_qfile = 0; 95 m_qfile = nullptr;
96 return; 96 return;
97 } 97 }
98 98
99 FishSoundInfo fsinfo; 99 FishSoundInfo fsinfo;
100 m_fishSound = fish_sound_new(FISH_SOUND_DECODE, &fsinfo); 100 m_fishSound = fish_sound_new(FISH_SOUND_DECODE, &fsinfo);
111 } 111 }
112 112
113 while (oggz_read(m_oggz, 1024) > 0); 113 while (oggz_read(m_oggz, 1024) > 0);
114 114
115 fish_sound_delete(m_fishSound); 115 fish_sound_delete(m_fishSound);
116 m_fishSound = 0; 116 m_fishSound = nullptr;
117 oggz_close(m_oggz); 117 oggz_close(m_oggz);
118 m_oggz = 0; 118 m_oggz = nullptr;
119 119
120 if (isDecodeCacheInitialised()) finishDecodeCache(); 120 if (isDecodeCacheInitialised()) finishDecodeCache();
121 endSerialised(); 121 endSerialised();
122 122
123 } else { 123 } else {
143 delete m_decodeThread; 143 delete m_decodeThread;
144 } 144 }
145 if (m_qfile) { 145 if (m_qfile) {
146 // don't fclose m_ffile; oggz_close did that 146 // don't fclose m_ffile; oggz_close did that
147 delete m_qfile; 147 delete m_qfile;
148 m_qfile = 0; 148 m_qfile = nullptr;
149 } 149 }
150 } 150 }
151 151
152 void 152 void
153 OggVorbisFileReader::cancelled() 153 OggVorbisFileReader::cancelled()
164 } 164 }
165 165
166 while (oggz_read(m_reader->m_oggz, 1024) > 0); 166 while (oggz_read(m_reader->m_oggz, 1024) > 0);
167 167
168 fish_sound_delete(m_reader->m_fishSound); 168 fish_sound_delete(m_reader->m_fishSound);
169 m_reader->m_fishSound = 0; 169 m_reader->m_fishSound = nullptr;
170 170
171 oggz_close(m_reader->m_oggz); 171 oggz_close(m_reader->m_oggz);
172 m_reader->m_oggz = 0; 172 m_reader->m_oggz = nullptr;
173 173
174 // don't fclose m_ffile; oggz_close did that 174 // don't fclose m_ffile; oggz_close did that
175 175
176 delete m_reader->m_qfile; 176 delete m_reader->m_qfile;
177 m_reader->m_qfile = 0; 177 m_reader->m_qfile = nullptr;
178 178
179 if (m_reader->isDecodeCacheInitialised()) m_reader->finishDecodeCache(); 179 if (m_reader->isDecodeCacheInitialised()) m_reader->finishDecodeCache();
180 m_reader->m_completion = 100; 180 m_reader->m_completion = 100;
181 181
182 m_reader->endSerialised(); 182 m_reader->endSerialised();