[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src audiofileio/decode/ResampleAudioRe...
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src audiofileio/decode/ResampleAudioRe... |
Date: |
Thu, 27 Sep 2007 19:38:34 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/09/27 19:38:34
Modified files:
src/audiofileio/decode: ResampleAudioReader.cpp
ResampleAudioReader.h
src/core : ReadSource.cpp
Log message:
it looks prettier now, no ?
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/ResampleAudioReader.cpp?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/ResampleAudioReader.h?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.cpp?cvsroot=traverso&r1=1.63&r2=1.64
Patches:
Index: audiofileio/decode/ResampleAudioReader.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/audiofileio/decode/ResampleAudioReader.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- audiofileio/decode/ResampleAudioReader.cpp 27 Sep 2007 19:20:29 -0000
1.13
+++ audiofileio/decode/ResampleAudioReader.cpp 27 Sep 2007 19:38:34 -0000
1.14
@@ -112,6 +112,8 @@
m_srcStates.pop_back();
}
+ clear_buffers();
+
for (int c = 0; c < m_reader->get_num_channels(); c++) {
m_srcStates.append(src_new(converter_type, 1, &error));
@@ -119,9 +121,9 @@
if (!m_srcStates[c]) {
PERROR("ResampleAudioReader: couldn't create
libSampleRate SRC_STATE");
m_isResampleAvailable = false;
+ break;
} else {
m_isResampleAvailable = true;
- clear_buffers();
}
}
Index: audiofileio/decode/ResampleAudioReader.h
===================================================================
RCS file:
/sources/traverso/traverso/src/audiofileio/decode/ResampleAudioReader.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- audiofileio/decode/ResampleAudioReader.h 27 Sep 2007 19:20:29 -0000
1.9
+++ audiofileio/decode/ResampleAudioReader.h 27 Sep 2007 19:38:34 -0000
1.10
@@ -34,6 +34,9 @@
ResampleAudioReader(QString filename, const QString& decoder);
~ResampleAudioReader();
+ nframes_t read_from(DecodeBuffer* buffer, TimeRef start, nframes_t
count) {
+ return AbstractAudioReader::read_from(buffer,
start.to_frame(m_outputRate), count);
+ }
QString decoder_type() const {return (m_reader) ?
m_reader->decoder_type() : "";}
void clear_buffers();
Index: core/ReadSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- core/ReadSource.cpp 27 Sep 2007 19:20:29 -0000 1.63
+++ core/ReadSource.cpp 27 Sep 2007 19:38:34 -0000 1.64
@@ -282,13 +282,19 @@
int ReadSource::file_read(DecodeBuffer* buffer, TimeRef& start, nframes_t cnt)
const
{
// PROFILE_START;
- int rate = m_audioReader->get_output_rate();
- nframes_t result = m_audioReader->read_from(buffer,
start.to_frame(rate), cnt);
+ nframes_t result = m_audioReader->read_from(buffer, start, cnt);
// PROFILE_END("ReadSource::fileread");
return result;
}
+int ReadSource::file_read(DecodeBuffer * buffer, nframes_t start, nframes_t
cnt)
+{
+ // Any way to avoid this casting, anyone ??
+ return ((AbstractAudioReader*)m_audioReader)->read_from(buffer, start,
cnt);
+}
+
+
ReadSource * ReadSource::deep_copy( )
{
PENTER;
@@ -600,14 +606,6 @@
}
}
-
-int ReadSource::file_read(DecodeBuffer * buffer, nframes_t start, nframes_t
cnt)
-{
- TimeRef startlocation(start, m_audioReader->get_output_rate());
- return file_read(buffer, startlocation, cnt);
-}
-
-
int ReadSource::get_file_rate() const
{
if (m_audioReader) {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src audiofileio/decode/ResampleAudioRe...,
Remon Sijrier <=