most clip marker work completed #333

2019-02-01 02:53:54 +11:00
parent 0513749b9d
commit db92e5231f
11 changed files with 149 additions and 50 deletions
@@ -427,10 +427,24 @@ bool LoadThread::load_worker(QFile& f, QXmlStreamReader& stream, int type) {
 													}
 												}
 												if (cancelled) return false;
-											} else if (stream.isStartElement() && (stream.name() == "effect" || stream.name() == "opening" || stream.name() == "closing")) {
+                                            } else if (stream.isStartElement()
+                                                           && (stream.name() == "effect"
+                                                               || stream.name() == "opening"
+                                                               || stream.name() == "closing")) {
 												// "opening" and "closing" are backwards compatibility code
 												load_effect(stream, c);
-											}
+                                            } else if (stream.name() == "marker" && stream.isStartElement()) {
+                                                Marker m;
+                                                for (int j=0;j<stream.attributes().size();j++) {
+                                                    const QXmlStreamAttribute& attr = stream.attributes().at(j);
+                                                    if (attr.name() == "frame") {
+                                                        m.frame = attr.value().toLong();
+                                                    } else if (attr.name() == "name") {
+                                                        m.name = attr.value().toString();
+                                                    }
+                                                }
+                                                c->markers.append(m);
+                                            }
 										}
 									}
 									if (cancelled) return false;