X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdvdwizardchapters.cpp;h=35aaf02e399133b611e9c576512cab48198c4bc5;hb=a3eee7be24126f5a3458d488f44cd61c66135e17;hp=3414a7c90215addf2061a5d0b32088a50e026f32;hpb=e0fa1332f109b6455207ea701da386b2fddddf09;p=kdenlive diff --git a/src/dvdwizardchapters.cpp b/src/dvdwizardchapters.cpp index 3414a7c9..35aaf02e 100644 --- a/src/dvdwizardchapters.cpp +++ b/src/dvdwizardchapters.cpp @@ -24,10 +24,10 @@ #include 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; } @@ -119,7 +119,7 @@ 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()); + markers << CommentedTime(GenTime(frame.toInt(), m_tc.fps()), QString()); } m_monitor->setMarkers(markers); } @@ -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); } } @@ -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(); } @@ -257,3 +257,5 @@ QDomElement DvdWizardChapters::toXml() const } return doc.documentElement(); } + +#include "dvdwizardchapters.moc"