X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdvdwizardchapters.cpp;h=35aaf02e399133b611e9c576512cab48198c4bc5;hb=a3eee7be24126f5a3458d488f44cd61c66135e17;hp=52464b3f6a10bfa296046876f91dcc283923e024;hpb=a1f0a54b93ab364a37fd8242c1881c61d066ada7;p=kdenlive diff --git a/src/dvdwizardchapters.cpp b/src/dvdwizardchapters.cpp index 52464b3f..35aaf02e 100644 --- a/src/dvdwizardchapters.cpp +++ b/src/dvdwizardchapters.cpp @@ -23,10 +23,11 @@ #include -DvdWizardChapters::DvdWizardChapters(bool isPal, QWidget *parent) : - QWizardPage(parent), - m_isPal(isPal), - m_monitor(NULL) +DvdWizardChapters::DvdWizardChapters(MonitorManager *manager, DVDFORMAT format, QWidget *parent) : + QWizardPage(parent), + m_format(format), + m_monitor(NULL), + m_manager(manager) { m_view.setupUi(this); @@ -37,21 +38,18 @@ DvdWizardChapters::DvdWizardChapters(bool isPal, QWidget *parent) : // Build monitor for chapters - if (m_isPal) m_tc.setFormat(25); + if (m_format == PAL || m_format == PAL_WIDE) m_tc.setFormat(25); else m_tc.setFormat(30000.0 / 1001); - - m_manager = new MonitorManager(this); - m_manager->resetProfiles(m_tc); //m_view.monitor_frame->setVisible(false); } DvdWizardChapters::~DvdWizardChapters() { if (m_monitor) { + m_manager->removeMonitor(m_monitor); m_monitor->stop(); delete m_monitor; } - delete m_manager; } // virtual @@ -66,6 +64,11 @@ 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()); @@ -74,11 +77,12 @@ 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(); } @@ -90,15 +94,15 @@ 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 @@ -107,6 +111,17 @@ void DvdWizardChapters::slotAddChapter() 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() @@ -122,56 +137,67 @@ void DvdWizardChapters::slotRemoveChapter() // 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() { - if (m_view.chapters_list->currentItem()) m_monitor->setTimePos(m_tc.reformatSeparators(m_view.chapters_list->currentItem()->text() + ":00")); + if (m_view.chapters_list->currentItem()) m_monitor->setTimePos(m_tc.reformatSeparators(m_view.chapters_list->currentItem()->text())); } -void DvdWizardChapters::setVobFiles(bool isPal, bool isWide, const QStringList &movies, const QStringList &durations, const QStringList &chapters) +void DvdWizardChapters::createMonitor(DVDFORMAT format) { - m_isPal = isPal; - QString profile; - if (m_isPal) { - m_tc.setFormat(25); - profile = "dv_pal"; - } else { - m_tc.setFormat(30000.0 / 1001); - profile = "dv_ntsc"; - } - if (isWide) profile.append("_wide"); - m_manager->resetProfiles(m_tc); + 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.monitor_frame->setLayout(vbox); - /*updateGeometry(); - m_view.monitor_frame->adjustSize();*/ - } else m_monitor->resetProfile(profile); + 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); + } +} + +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)); 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++) { + 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); } @@ -182,11 +208,11 @@ 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; @@ -197,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; } @@ -206,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(); @@ -223,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(";")); @@ -231,3 +257,5 @@ QDomElement DvdWizardChapters::toXml() const } return doc.documentElement(); } + +#include "dvdwizardchapters.moc"