X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdvdwizardchapters.cpp;h=35aaf02e399133b611e9c576512cab48198c4bc5;hb=a3eee7be24126f5a3458d488f44cd61c66135e17;hp=1eafceb95971e891758a29d429b1af9ec80ce5bd;hpb=bf67d14b18cc897935691c96da63a2e978c5ba3a;p=kdenlive diff --git a/src/dvdwizardchapters.cpp b/src/dvdwizardchapters.cpp index 1eafceb9..35aaf02e 100644 --- a/src/dvdwizardchapters.cpp +++ b/src/dvdwizardchapters.cpp @@ -23,9 +23,11 @@ #include -DvdWizardChapters::DvdWizardChapters(bool isPal, QWidget *parent) : - QWizardPage(parent), - m_isPal(isPal) +DvdWizardChapters::DvdWizardChapters(MonitorManager *manager, DVDFORMAT format, QWidget *parent) : + QWizardPage(parent), + m_format(format), + m_monitor(NULL), + m_manager(manager) { m_view.setupUi(this); @@ -36,25 +38,18 @@ DvdWizardChapters::DvdWizardChapters(bool isPal, QWidget *parent) : // Build monitor for chapters - if (m_isPal) m_tc.setFormat(25); - else m_tc.setFormat(30, true); - - m_manager = new MonitorManager(this); - m_manager->resetProfiles(m_tc); - m_monitor = new Monitor("chapter", m_manager, this); - m_monitor->start(); - - QVBoxLayout *vbox = new QVBoxLayout; - vbox->addWidget(m_monitor); - m_view.monitor_frame->setLayout(vbox); - - + if (m_format == PAL || m_format == PAL_WIDE) m_tc.setFormat(25); + else m_tc.setFormat(30000.0 / 1001); + //m_view.monitor_frame->setVisible(false); } DvdWizardChapters::~DvdWizardChapters() { - delete m_monitor; - delete m_manager; + if (m_monitor) { + m_manager->removeMonitor(m_monitor); + m_monitor->stop(); + delete m_monitor; + } } // virtual @@ -64,6 +59,16 @@ bool DvdWizardChapters::isComplete() const return true; } +void DvdWizardChapters::stopMonitor() +{ + if (m_monitor) m_monitor->stop(); +} + +void DvdWizardChapters::refreshMonitor() +{ + if (m_monitor) m_monitor->refreshMonitor(); +} + void DvdWizardChapters::slotUpdateChaptersList() { m_monitor->slotOpenFile(m_view.vob_list->currentText()); @@ -72,11 +77,14 @@ void DvdWizardChapters::slotUpdateChaptersList() // insert chapters QStringList chaptersString; - for (int i = 0; i < currentChaps.count(); i++) { - chaptersString.append(Timecode::getStringTimecode(currentChaps.at(i).toInt(), m_tc.fps())); + 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(); m_view.chapters_list->addItems(chaptersString); + updateMonitorMarkers(); + + //bool modified = m_view.vob_list->itemData(m_view.vob_list->currentIndex(), Qt::UserRole + 2).toInt(); } void DvdWizardChapters::slotAddChapter() @@ -86,20 +94,34 @@ void DvdWizardChapters::slotAddChapter() if (currentChaps.contains(QString::number(pos))) return; else currentChaps.append(QString::number(pos)); QList 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++) { - chaptersString.append(Timecode::getStringTimecode(chapterTimes.at(i), m_tc.fps())); + 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))); } + // Save item chapters m_view.vob_list->setItemData(m_view.vob_list->currentIndex(), currentChaps, Qt::UserRole + 1); + // Mark item as modified + m_view.vob_list->setItemData(m_view.vob_list->currentIndex(), 1, Qt::UserRole + 2); m_view.chapters_list->clear(); m_view.chapters_list->addItems(chaptersString); + updateMonitorMarkers(); +} + +void DvdWizardChapters::updateMonitorMarkers() +{ + QStringList chapters = m_view.vob_list->itemData(m_view.vob_list->currentIndex(), Qt::UserRole + 1).toStringList(); + QList markers; + foreach(const QString &frame, chapters) { + markers << CommentedTime(GenTime(frame.toInt(), m_tc.fps()), QString()); + } + m_monitor->setMarkers(markers); } void DvdWizardChapters::slotRemoveChapter() @@ -107,77 +129,90 @@ void DvdWizardChapters::slotRemoveChapter() int ix = m_view.chapters_list->currentRow(); QStringList currentChaps = m_view.vob_list->itemData(m_view.vob_list->currentIndex(), Qt::UserRole + 1).toStringList(); currentChaps.removeAt(ix); + + // Save item chapters m_view.vob_list->setItemData(m_view.vob_list->currentIndex(), currentChaps, Qt::UserRole + 1); + // Mark item as modified + m_view.vob_list->setItemData(m_view.vob_list->currentIndex(), 1, Qt::UserRole + 2); // rebuild chapters QStringList chaptersString; - for (int i = 0; i < currentChaps.count(); i++) { - chaptersString.append(Timecode::getStringTimecode(currentChaps.at(i).toInt(), m_tc.fps())); + 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(); m_view.chapters_list->addItems(chaptersString); + updateMonitorMarkers(); } void DvdWizardChapters::slotGoToChapter() { - m_monitor->setTimePos(m_view.chapters_list->currentItem()->text() + ":00"); -} - -void DvdWizardChapters::slotGetChaptersList(int ix) -{ - QString url = m_view.vob_list->itemText(ix); - if (QFile::exists(url + ".dvdchapter")) { - // insert chapters as children - QFile file(url + ".dvdchapter"); - if (file.open(QIODevice::ReadOnly)) { - QDomDocument doc; - doc.setContent(&file); - file.close(); - QDomNodeList chapters = doc.elementsByTagName("chapter"); - QStringList chaptersList; - for (int j = 0; j < chapters.count(); j++) { - chaptersList.append(QString::number(chapters.at(j).toElement().attribute("time").toInt())); - } - m_view.vob_list->setItemData(ix, chaptersList, Qt::UserRole + 1); - } - } + if (m_view.chapters_list->currentItem()) m_monitor->setTimePos(m_tc.reformatSeparators(m_view.chapters_list->currentItem()->text())); } -void DvdWizardChapters::setVobFiles(bool isPal, const QStringList movies, const QStringList durations) +void DvdWizardChapters::createMonitor(DVDFORMAT format) { - m_isPal = isPal; - if (m_isPal) m_tc.setFormat(25); - else m_tc.setFormat(30, true); - m_manager->resetProfiles(m_tc); - m_monitor->resetProfile(); + QString profile = DvdWizardVob::getDvdProfile(format); + if (m_monitor == NULL) { + 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); + } +} - if (m_view.vob_list->count() == movies.count()) { - bool equal = true; - for (int i = 0; i < movies.count(); i++) { - if (movies.at(i) != m_view.vob_list->itemText(i)) { - equal = false; - break; - } - } - if (equal) return; +void DvdWizardChapters::setVobFiles(DVDFORMAT format, const QStringList &movies, const QStringList &durations, const QStringList &chapters) +{ + m_format = format; + QString profile = DvdWizardVob::getDvdProfile(format); + if (m_format == PAL || m_format == PAL_WIDE) { + m_tc.setFormat(25); + } else { + m_tc.setFormat(30000.0 / 1001); } + + if (m_monitor == NULL) createMonitor(format); + m_monitor->setCustomProfile(profile, m_tc); + + 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)); - slotGetChaptersList(i); + m_view.vob_list->setItemData(i, chapters.at(i).split(';'), Qt::UserRole + 1); } + m_view.vob_list->blockSignals(false); slotUpdateChaptersList(); + setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + adjustSize(); + updateGeometry(); + m_manager->activateMonitor(Kdenlive::DvdMonitor); + m_monitor->refreshMonitor(); +} + +QMap DvdWizardChapters::chaptersData() const +{ + QMap result; + int max = m_view.vob_list->count(); + 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); + } + return result; } 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++) { - result.append(Timecode::getStringTimecode(chapters.at(j).toInt(), m_tc.fps())); + result.append(Timecode::getStringTimecode(chapters.at(j).toInt(), m_tc.fps(), true)); } } return result; @@ -188,7 +223,7 @@ QStringList DvdWizardChapters::chapters(int ix) const QStringList result; QStringList chapters = m_view.vob_list->itemData(ix, Qt::UserRole + 1).toStringList(); for (int j = 0; j < chapters.count(); j++) { - result.append(Timecode::getStringTimecode(chapters.at(j).toInt(), m_tc.fps())); + result.append(Timecode::getStringTimecode(chapters.at(j).toInt(), m_tc.fps(), true)); } return result; } @@ -197,12 +232,30 @@ QStringList DvdWizardChapters::selectedTargets() const { QStringList result; int max = m_view.vob_list->count(); - for (int i = 0; i < max; i++) { - result.append("jump title " + QString::number(i + 1)); + 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(); for (int j = 0; j < chapters.count(); j++) { - result.append("jump title " + QString::number(i + 1) + " chapter " + QString::number(j + 1)); + result.append("jump title " + QString::number(i + 1).rightJustified(2, '0') + " chapter " + QString::number(j + 1).rightJustified(2, '0')); } } return result; } + + +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) { + 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(";")); + xml.appendChild(vob); + } + return doc.documentElement(); +} + +#include "dvdwizardchapters.moc"