[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/commands Import.cpp Import.h
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src/commands Import.cpp Import.h |
Date: |
Wed, 21 May 2008 11:11:33 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 08/05/21 11:11:33
Modified files:
src/commands : Import.cpp Import.h
Log message:
Cleanup constructors, init m_readsource to 0
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Import.cpp?cvsroot=traverso&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Import.h?cvsroot=traverso&r1=1.8&r2=1.9
Patches:
Index: Import.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Import.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- Import.cpp 23 Jan 2008 17:31:03 -0000 1.36
+++ Import.cpp 21 May 2008 11:11:33 -0000 1.37
@@ -33,22 +33,15 @@
Import::Import(const QString& fileName)
: Command("")
{
- m_fileName = fileName;
- m_clip = 0;
- m_track = 0;
- m_silent = false;
- m_hasPosition = false;
- m_initialLength = TimeRef();
+ init(0, fileName);
}
Import::Import(Track* track, const TimeRef& length, bool silent)
: Command(track, "")
{
- m_track = track;
- m_clip = 0;
+ init(track, "");
m_silent = silent;
- m_hasPosition = false;
m_initialLength = length;
if (!m_silent) {
@@ -62,26 +55,32 @@
Import::Import(Track* track, const QString& fileName)
: Command(track, tr("Import Audio File"))
{
- m_track = track;
- m_clip = 0;
- m_fileName = fileName;
- m_silent = false;
- m_hasPosition = false;
- m_initialLength = TimeRef();
+ init(track, fileName);
}
Import::Import(Track* track, const QString& fileName, const TimeRef& position)
: Command(track, tr("Import Audio File"))
{
- m_track = track;
+ init(track, fileName);
+ m_hasPosition = true;
+ m_position = position;
+}
+
+void Import::init(Track* track, const QString& fileName)
+{
m_clip = 0;
- m_fileName = fileName;
+ m_source = 0;
+ m_position = TimeRef();
m_silent = false;
+ m_hasPosition = false;
+ m_fileName = fileName;
+ m_track = track;
m_initialLength = TimeRef();
- m_hasPosition = true;
- m_position = position;
+
}
+
+
Import::~Import()
{}
@@ -198,5 +197,3 @@
// eof
-
-
Index: Import.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Import.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Import.h 28 Sep 2007 18:33:43 -0000 1.8
+++ Import.h 21 May 2008 11:11:33 -0000 1.9
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- $Id: Import.h,v 1.8 2007/09/28 18:33:43 r_sijrier Exp $
+ $Id: Import.h,v 1.9 2008/05/21 11:11:33 r_sijrier Exp $
*/
#ifndef IMPORT_H
@@ -57,6 +57,8 @@
TimeRef m_initialLength;
bool m_hasPosition;
TimeRef m_position;
+
+ void init(Track* track, const QString& filename);
};
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/commands Import.cpp Import.h,
Remon Sijrier <=