improved loading speed and corrected snapping bug
This commit is contained in:
+20
-3
@@ -813,9 +813,8 @@ bool Project::load_worker(QFile& f, QXmlStreamReader& stream, int type) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// analyze media to see if it's the same
|
// analyze media to see if it's the same
|
||||||
start_preview_generator(item, m, true);
|
|
||||||
|
|
||||||
loaded_media.append(m);
|
loaded_media.append(m);
|
||||||
|
loaded_media_items.append(item);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case MEDIA_TYPE_SEQUENCE:
|
case MEDIA_TYPE_SEQUENCE:
|
||||||
@@ -1090,12 +1089,26 @@ void Project::load_project() {
|
|||||||
// temp variables for loading
|
// temp variables for loading
|
||||||
loaded_folders.clear();
|
loaded_folders.clear();
|
||||||
loaded_media.clear();
|
loaded_media.clear();
|
||||||
|
loaded_media_items.clear();
|
||||||
loaded_clips.clear();
|
loaded_clips.clear();
|
||||||
loaded_sequences.clear();
|
loaded_sequences.clear();
|
||||||
open_seq = NULL;
|
open_seq = NULL;
|
||||||
|
|
||||||
|
// get "element" count
|
||||||
|
int element_count = 0;
|
||||||
|
while (!stream.atEnd()) {
|
||||||
|
stream.readNextStartElement();
|
||||||
|
if (stream.name() == "folder"
|
||||||
|
|| stream.name() == "footage"
|
||||||
|
|| stream.name() == "sequence"
|
||||||
|
|| stream.name() == "clip"
|
||||||
|
|| stream.name() == "effect") {
|
||||||
|
element_count++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// find project file version
|
// find project file version
|
||||||
cont = load_worker(file, stream, LOAD_TYPE_VERSION);
|
cont = load_worker(file, stream, LOAD_TYPE_VERSION);
|
||||||
|
|
||||||
// load folders first
|
// load folders first
|
||||||
if (cont) {
|
if (cont) {
|
||||||
@@ -1147,6 +1160,10 @@ void Project::load_project() {
|
|||||||
|
|
||||||
update_ui(false);
|
update_ui(false);
|
||||||
mainWindow->setWindowModified(false);
|
mainWindow->setWindowModified(false);
|
||||||
|
|
||||||
|
for (int i=0;i<loaded_media_items.size();i++) {
|
||||||
|
start_preview_generator(loaded_media_items.at(i), loaded_media.at(i), true);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
new_project();
|
new_project();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,6 +91,7 @@ private:
|
|||||||
Sequence* open_seq;
|
Sequence* open_seq;
|
||||||
QVector<QTreeWidgetItem*> loaded_folders;
|
QVector<QTreeWidgetItem*> loaded_folders;
|
||||||
QVector<Media*> loaded_media;
|
QVector<Media*> loaded_media;
|
||||||
|
QVector<QTreeWidgetItem*> loaded_media_items;
|
||||||
QVector<Clip*> loaded_clips;
|
QVector<Clip*> loaded_clips;
|
||||||
QVector<Sequence*> loaded_sequences;
|
QVector<Sequence*> loaded_sequences;
|
||||||
QTreeWidgetItem* find_loaded_folder_by_id(int id);
|
QTreeWidgetItem* find_loaded_folder_by_id(int id);
|
||||||
|
|||||||
+1
-1
@@ -388,7 +388,7 @@ bool Timeline::is_clip_selected(Clip* clip, bool containing) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Timeline::on_snappingButton_toggled(bool checked) {
|
void Timeline::on_snappingButton_toggled(bool checked) {
|
||||||
//snapping = checked;
|
snapping = checked;
|
||||||
}
|
}
|
||||||
|
|
||||||
Clip* Timeline::split_clip(ComboAction* ca, int p, long frame) {
|
Clip* Timeline::split_clip(ComboAction* ca, int p, long frame) {
|
||||||
|
|||||||
Reference in New Issue
Block a user