hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix broken data file upgrade (#6279)

Browse Source 
Fixes issues introduced in previous commit (55d361fb65),
which affected loading, saving and drag-dropping of clips.
This commit is contained in:
Alexandre Almeida
2022-01-15 18:19:34 -03:00
committed by GitHub
parent 55d361fb65
commit 7fe2152938
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/AutomationClip.h
View File

@@ -149,7 +149,7 @@ public:
void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
void loadSettings( const QDomElement & _this ) override;
static const QString classNodeName() { return "automationclip"; }
static const QString classNodeName() { return "automationpattern"; }
QString nodeName() const override { return classNodeName(); }
ClipView * createView( TrackView * _tv ) override;

2
include/BBClip.h
View File

@@ -39,7 +39,7 @@ public:
void loadSettings( const QDomElement & _this ) override;
inline QString nodeName() const override
{
return( "bbclip" );
return( "bbtco" );
}
int bbTrackIndex();

2
include/SampleClip.h
View File

@@ -48,7 +48,7 @@ public:
void loadSettings( const QDomElement & _this ) override;
inline QString nodeName() const override
{
return "sampleclip";
return "sampletco";
}
SampleBuffer* sampleBuffer()

6
src/core/DataFile.cpp
View File

@@ -54,7 +54,7 @@ static void findIds(const QDomElement& elem, QList<jo_id_t>& idList);
// QMap with the DOM elements that access file resources
const DataFile::ResourcesMap DataFile::ELEMENTS_WITH_RESOURCES = {
{ "sampleclip", {"src"} },
{ "sampletco", {"src"} },
{ "audiofileprocessor", {"src"} },
};
@@ -915,7 +915,7 @@ void DataFile::upgrade_0_4_0_20080409()
{
// Upgrade to version 0.4.0-20080409 from some version greater than or equal to 0.4.0-20080129
QStringList s;
s << "note" << "pattern" << "bbclip" << "sampleclip" << "time";
s << "note" << "pattern" << "bbtco" << "sampletco" << "time";
for( QStringList::iterator it = s.begin(); it < s.end(); ++it )
{
QDomNodeList list = elementsByTagName( *it );
@@ -1625,7 +1625,7 @@ void DataFile::upgrade_noHiddenClipNames()
QDomNodeList instClips = track.elementsByTagName("pattern");
QDomNodeList autoClips = track.elementsByTagName("automationpattern");
QDomNodeList bbClips = track.elementsByTagName("bbclip");
QDomNodeList bbClips = track.elementsByTagName("bbtco");
clearDefaultNames(instClips, trackName);
clearDefaultNames(autoClips, trackName);