eeva/jamulus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use variable frame size in Reaper project

Browse Source
This commit is contained in:
Peter L Jones 2020-04-10 17:52:17 +01:00
parent a80b437858
commit e4ac2f472d
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/recorder/creaperproject.cpp
View File

@ -55,7 +55,7 @@ using namespace recorder;
* @param trackItem the details of where the item is in the track, along with the RIFF WAVE filename * @param trackItem the details of where the item is in the track, along with the RIFF WAVE filename
* @param iid the sequential item id * @param iid the sequential item id
*/ */
CReaperItem::CReaperItem(const QString& name, const STrackItem& trackItem, const qint32& iid) CReaperItem::CReaperItem(const QString& name, const STrackItem& trackItem, const qint32& iid, int frameSize)
{ {
QString wavName = trackItem.fileName; // assume RPP in same location... QString wavName = trackItem.fileName; // assume RPP in same location...
@ -64,8 +64,8 @@ CReaperItem::CReaperItem(const QString& name, const STrackItem& trackItem, const
sOut << " <ITEM " << endl; sOut << " <ITEM " << endl;
sOut << " FADEIN 0 0 0 0 0 0" << endl; sOut << " FADEIN 0 0 0 0 0 0" << endl;
sOut << " FADEOUT 0 0 0 0 0 0" << endl; sOut << " FADEOUT 0 0 0 0 0 0" << endl;
sOut << " POSITION " << secondsAt48K(trackItem.startFrame) << endl; sOut << " POSITION " << secondsAt48K( trackItem.startFrame, frameSize ) << endl;
sOut << " LENGTH " << secondsAt48K(trackItem.frameCount) << endl; sOut << " LENGTH " << secondsAt48K( trackItem.frameCount, frameSize ) << endl;
sOut << " IGUID " << iguid.toString() << endl; sOut << " IGUID " << iguid.toString() << endl;
sOut << " IID " << iid << endl; sOut << " IID " << iid << endl;
sOut << " NAME " << name << endl; sOut << " NAME " << name << endl;
@ -86,7 +86,7 @@ CReaperItem::CReaperItem(const QString& name, const STrackItem& trackItem, const
* @param iid the sequential track id * @param iid the sequential track id
* @param items the list of items in the track * @param items the list of items in the track
*/ */
CReaperTrack::CReaperTrack(QString name, qint32& iid, QList<STrackItem> items) CReaperTrack::CReaperTrack(QString name, qint32& iid, QList<STrackItem> items, int frameSize)
{ {
QTextStream sOut(&out); QTextStream sOut(&out);
@ -96,7 +96,7 @@ CReaperTrack::CReaperTrack(QString name, qint32& iid, QList<STrackItem> items)
int ino = 1; int ino = 1;
foreach (auto item, items) { foreach (auto item, items) {
sOut << CReaperItem(name + " (" + QString::number(ino) + ")", item, iid).toString() << endl; sOut << CReaperItem(name + " (" + QString::number(ino) + ")", item, iid, frameSize).toString() << endl;
ino++; ino++;
iid++; iid++;
} }
@ -109,7 +109,7 @@ CReaperTrack::CReaperTrack(QString name, qint32& iid, QList<STrackItem> items)
* @brief CReaperProject::CReaperProject Construct a Reaper RPP "<REAPER_PROJECT>" for a given list of tracks * @brief CReaperProject::CReaperProject Construct a Reaper RPP "<REAPER_PROJECT>" for a given list of tracks
* @param tracks the list of tracks * @param tracks the list of tracks
*/ */
CReaperProject::CReaperProject(QMap<QString, QList<STrackItem>> tracks) CReaperProject::CReaperProject(QMap<QString, QList<STrackItem>> tracks, int frameSize)
{ {
QTextStream sOut(&out); QTextStream sOut(&out);
@ -121,7 +121,7 @@ CReaperProject::CReaperProject(QMap<QString, QList<STrackItem>> tracks)
qint32 iid = 0; qint32 iid = 0;
foreach(auto trackName, tracks.keys()) foreach(auto trackName, tracks.keys())
{ {
sOut << CReaperTrack(trackName, iid, tracks[trackName]).toString() << endl; sOut << CReaperTrack(trackName, iid, tracks[trackName], frameSize).toString() << endl;
} }
sOut << ">"; sOut << ">";

12
src/recorder/creaperproject.h
View File

@ -52,7 +52,7 @@ class CReaperItem : public QObject
Q_OBJECT Q_OBJECT
public: public:
CReaperItem(const QString& name, const STrackItem& trackItem, const qint32& iid); CReaperItem( const QString& name, const STrackItem& trackItem, const qint32& iid, int frameSize );
QString toString() { return out; } QString toString() { return out; }
private: private:
@ -60,7 +60,11 @@ private:
const QUuid guid = QUuid::createUuid(); const QUuid guid = QUuid::createUuid();
QString out; QString out;
inline QString secondsAt48K(const qint64 frames) { return QString::number(static_cast<double>(frames * SYSTEM_FRAME_SIZE_SAMPLES) / 48000, 'f', 14); } inline QString secondsAt48K( const qint64 frames,
const int frameSize )
{
return QString::number( static_cast<double>( frames * frameSize ) / 48000, 'f', 14 );
}
}; };
class CReaperTrack : public QObject class CReaperTrack : public QObject
@ -68,7 +72,7 @@ class CReaperTrack : public QObject
Q_OBJECT Q_OBJECT
public: public:
CReaperTrack(QString name, qint32 &iid, QList<STrackItem> items); CReaperTrack( QString name, qint32 &iid, QList<STrackItem> items, int frameSize );
QString toString() { return out; } QString toString() { return out; }
private: private:
@ -81,7 +85,7 @@ class CReaperProject : public QObject
Q_OBJECT Q_OBJECT
public: public:
CReaperProject(QMap<QString, QList<STrackItem> > tracks); CReaperProject( QMap<QString, QList<STrackItem> > tracks, int frameSize );
QString toString() { return out; } QString toString() { return out; }
private: private: