Various changes for getting an OpenGL context (almost) everywhere it is needed.

[kdenlive] / src / dvdwizardchapters.cpp

diff --git a/src/dvdwizardchapters.cpp b/src/dvdwizardchapters.cpp
index b289445f3aece719691def037aef5cf63246fe9d..35aaf02e399133b611e9c576512cab48198c4bc5 100644 (file)
--- a/src/dvdwizardchapters.cpp
+++ b/src/dvdwizardchapters.cpp
@@ -24,10 +24,10 @@
 #include <QFile>
 
 DvdWizardChapters::DvdWizardChapters(MonitorManager *manager, DVDFORMAT format, QWidget *parent) :
-        QWizardPage(parent),
-        m_format(format),
-        m_monitor(NULL),
-        m_manager(manager)
+    QWizardPage(parent),
+    m_format(format),
+    m_monitor(NULL),
+    m_manager(manager)
 
 {
     m_view.setupUi(this);
@@ -46,7 +46,7 @@ DvdWizardChapters::DvdWizardChapters(MonitorManager *manager, DVDFORMAT format,
 DvdWizardChapters::~DvdWizardChapters()
 {
     if (m_monitor) {
-       m_manager->removeMonitor(m_monitor);
+        m_manager->removeMonitor(m_monitor);
         m_monitor->stop();
         delete m_monitor;
     }
@@ -77,7 +77,7 @@ void DvdWizardChapters::slotUpdateChaptersList()
 
     // insert chapters
     QStringList chaptersString;
-    for (int i = 0; i < currentChaps.count(); i++) {
+    for (int i = 0; i < currentChaps.count(); ++i) {
         chaptersString.append(Timecode::getStringTimecode(currentChaps.at(i).toInt(), m_tc.fps(), true));
     }
     m_view.chapters_list->clear();
@@ -94,14 +94,14 @@ void DvdWizardChapters::slotAddChapter()
     if (currentChaps.contains(QString::number(pos))) return;
     else currentChaps.append(QString::number(pos));
     QList <int> chapterTimes;
-    for (int i = 0; i < currentChaps.count(); i++)
+    for (int i = 0; i < currentChaps.count(); ++i)
         chapterTimes.append(currentChaps.at(i).toInt());
     qSort(chapterTimes);
 
     // rebuild chapters
     QStringList chaptersString;
     currentChaps.clear();
-    for (int i = 0; i < chapterTimes.count(); i++) {
+    for (int i = 0; i < chapterTimes.count(); ++i) {
         chaptersString.append(Timecode::getStringTimecode(chapterTimes.at(i), m_tc.fps(), true));
         currentChaps.append(QString::number(chapterTimes.at(i)));
     }
@@ -119,7 +119,7 @@ void DvdWizardChapters::updateMonitorMarkers()
     QStringList chapters = m_view.vob_list->itemData(m_view.vob_list->currentIndex(), Qt::UserRole + 1).toStringList();
     QList <CommentedTime> markers;
     foreach(const QString &frame, chapters) {
-       markers << CommentedTime(GenTime(frame.toInt(), m_tc.fps()), QString());
+        markers << CommentedTime(GenTime(frame.toInt(), m_tc.fps()), QString());
     }
     m_monitor->setMarkers(markers);
 }
@@ -137,7 +137,7 @@ void DvdWizardChapters::slotRemoveChapter()
 
     // rebuild chapters
     QStringList chaptersString;
-    for (int i = 0; i < currentChaps.count(); i++) {
+    for (int i = 0; i < currentChaps.count(); ++i) {
         chaptersString.append(Timecode::getStringTimecode(currentChaps.at(i).toInt(), m_tc.fps(), true));
     }
     m_view.chapters_list->clear();
@@ -154,14 +154,14 @@ void DvdWizardChapters::createMonitor(DVDFORMAT format)
 {
     QString profile = DvdWizardVob::getDvdProfile(format);
     if (m_monitor == NULL) {
-        m_monitor = new Monitor(Kdenlive::dvdMonitor, m_manager, profile, this);
+        m_monitor = new Monitor(Kdenlive::DvdMonitor, m_manager, NULL, profile, this);
         //m_monitor->start();
         QVBoxLayout *vbox = new QVBoxLayout;
         vbox->addWidget(m_monitor);
         m_view.video_frame->setLayout(vbox);
-       m_monitor->setSizePolicy(QSizePolicy ( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
-       m_manager->appendMonitor(m_monitor);
-       vbox->insertWidget(0, m_monitor, 10);
+        m_monitor->setSizePolicy(QSizePolicy ( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+        m_manager->appendMonitor(m_monitor);
+        vbox->insertWidget(0, m_monitor, 10);
     }
 }
 
@@ -180,7 +180,7 @@ void DvdWizardChapters::setVobFiles(DVDFORMAT format, const QStringList &movies,
 
     m_view.vob_list->blockSignals(true);
     m_view.vob_list->clear();
-    for (int i = 0; i < movies.count(); i++) {
+    for (int i = 0; i < movies.count(); ++i) {
         m_view.vob_list->addItem(movies.at(i), durations.at(i));
         m_view.vob_list->setItemData(i, chapters.at(i).split(';'), Qt::UserRole + 1);
     }
@@ -189,7 +189,7 @@ void DvdWizardChapters::setVobFiles(DVDFORMAT format, const QStringList &movies,
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     adjustSize();
     updateGeometry();
-    m_manager->activateMonitor(Kdenlive::dvdMonitor);
+    m_manager->activateMonitor(Kdenlive::DvdMonitor);
     m_monitor->refreshMonitor();
 }
 
@@ -197,7 +197,7 @@ QMap <QString, QString> DvdWizardChapters::chaptersData() const
 {
     QMap <QString, QString> result;
     int max = m_view.vob_list->count();
-    for (int i = 0; i < max; i++) {
+    for (int i = 0; i < max; ++i) {
         QString chapters = m_view.vob_list->itemData(i, Qt::UserRole + 1).toStringList().join(";");
         result.insert(m_view.vob_list->itemText(i), chapters);
     }
@@ -208,7 +208,7 @@ QStringList DvdWizardChapters::selectedTitles() const
 {
     QStringList result;
     int max = m_view.vob_list->count();
-    for (int i = 0; i < max; i++) {
+    for (int i = 0; i < max; ++i) {
         result.append(m_view.vob_list->itemText(i));
         QStringList chapters = m_view.vob_list->itemData(i, Qt::UserRole + 1).toStringList();
         for (int j = 0; j < chapters.count(); j++) {
@@ -232,7 +232,7 @@ QStringList DvdWizardChapters::selectedTargets() const
 {
     QStringList result;
     int max = m_view.vob_list->count();
-    for (int i = 0; i < max; i++) {
+    for (int i = 0; i < max; ++i) {
         // rightJustified: fill with 0s to make menus with more than 9 buttons work (now up to 99 buttons possible)
         result.append("jump title " + QString::number(i + 1).rightJustified(2, '0'));
         QStringList chapters = m_view.vob_list->itemData(i, Qt::UserRole + 1).toStringList();
@@ -249,7 +249,7 @@ QDomElement DvdWizardChapters::toXml() const
     QDomDocument doc;
     QDomElement xml = doc.createElement("xml");
     doc.appendChild(xml);
-    for (int i = 0; i < m_view.vob_list->count(); i++) {
+    for (int i = 0; i < m_view.vob_list->count(); ++i) {
         QDomElement vob = doc.createElement("vob");
         vob.setAttribute("file", m_view.vob_list->itemText(i));
         vob.setAttribute("chapters", m_view.vob_list->itemData(i, Qt::UserRole + 1).toStringList().join(";"));
@@ -257,3 +257,5 @@ QDomElement DvdWizardChapters::toXml() const
     }
     return doc.documentElement();
 }
+
+#include "dvdwizardchapters.moc"