Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-13 14:13:32 +02:00
Code Issues Releases Wiki Activity

TrackFactory functions return std::unique_ptr, although some callers...

Browse Source 
... release() them for now.
This commit is contained in:
Paul Licameli
2016-03-02 14:59:31 -05:00
parent f42a953752
commit 5ef4dd46a5
31 changed files with 91 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/import/ImportFFmpeg.cpp
View File

@@ -509,7 +509,7 @@ int FFmpegImportFileHandle::Import(TrackFactory *trackFactory,
int c;
for (c = 0; c < mScs[s]->m_stream->codec->channels; c++)
{
mChannels[s][c] = trackFactory->NewWaveTrack(mScs[s]->m_osamplefmt, mScs[s]->m_stream->codec->sample_rate);
mChannels[s][c] = trackFactory->NewWaveTrack(mScs[s]->m_osamplefmt, mScs[s]->m_stream->codec->sample_rate).release();
if (mScs[s]->m_stream->codec->channels == 2)
{

2
src/import/ImportFLAC.cpp
View File

@@ -442,7 +442,7 @@ int FLACImportFileHandle::Import(TrackFactory *trackFactory,
unsigned long c;
for (c = 0; c < mNumChannels; c++) {
mChannels[c] = trackFactory->NewWaveTrack(mFormat, mSampleRate);
mChannels[c] = trackFactory->NewWaveTrack(mFormat, mSampleRate).release();
if (mNumChannels == 2) {
switch (c) {

2
src/import/ImportMP3.cpp
View File

@@ -489,7 +489,7 @@ enum mad_flow output_cb(void *_data,
Read(wxT("/SamplingRate/DefaultProjectSampleFormat"), floatSample);
for(chn = 0; chn < channels; chn++) {
data->channels[chn] = data->trackFactory->NewWaveTrack(format, samplerate);
data->channels[chn] = data->trackFactory->NewWaveTrack(format, samplerate).release();
data->channels[chn]->SetChannel(Track::MonoChannel);
}

2
src/import/ImportOGG.cpp
View File

@@ -261,7 +261,7 @@ int OggImportFileHandle::Import(TrackFactory *trackFactory, Track ***outTracks,
mChannels[i] = new WaveTrack *[vi->channels];
for (c = 0; c < vi->channels; c++) {
mChannels[i][c] = trackFactory->NewWaveTrack(mFormat, vi->rate);
mChannels[i][c] = trackFactory->NewWaveTrack(mFormat, vi->rate).release();
if (vi->channels == 2) {
switch (c) {

2
src/import/ImportPCM.cpp
View File

@@ -342,7 +342,7 @@ int PCMImportFileHandle::Import(TrackFactory *trackFactory,
int c;
for (c = 0; c < mInfo.channels; c++) {
channels[c] = trackFactory->NewWaveTrack(mFormat, mInfo.samplerate);
channels[c] = trackFactory->NewWaveTrack(mFormat, mInfo.samplerate).release();
if (mInfo.channels > 1)
switch (c) {

2
src/import/ImportRaw.cpp
View File

@@ -191,7 +191,7 @@ int ImportRaw(wxWindow *parent, const wxString &fileName,
int c;
for (c = 0; c < numChannels; c++) {
channels[c] = trackFactory->NewWaveTrack(format, rate);
channels[c] = trackFactory->NewWaveTrack(format, rate).release();
if (numChannels > 1)
switch (c) {