X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=cedfc4e4cda61af0bb1d31aa64e8c652110b9f65;hb=2950bfaa74c8dbc91e72634a8c2efbc107f571ae;hp=2142f76e312ad551392273bc2659f0aeee1b1b1e;hpb=49770493349aad0bdad0a09a77c8ebccc35098bc;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index 2142f76e..cedfc4e4 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -41,7 +41,7 @@ #include -Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : +Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget *parent) : QWidget(parent), render(NULL), m_name(name), @@ -130,12 +130,14 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : //m_ruler->setPixelPerMark(3); + if (profile.isEmpty()) profile = KdenliveSettings::current_profile(); + QVBoxLayout *rendererBox = new QVBoxLayout(m_ui.video_frame); rendererBox->setContentsMargins(0, 0, 0, 0); #ifdef Q_WS_MAC m_glWidget = new VideoGLWidget(m_ui.video_frame); rendererBox->addWidget(m_glWidget); - render = new Render(m_name, (int) m_ui.video_frame->winId(), -1, this); + render = new Render(m_name, (int) m_ui.video_frame->winId(), -1, profile, this); m_glWidget->setImageAspectRatio(render->dar()); m_glWidget->setBackgroundColor(KdenliveSettings::window_background()); m_glWidget->resize(m_ui.video_frame->size()); @@ -144,7 +146,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : #else m_monitorRefresh = new MonitorRefresh(m_ui.video_frame); rendererBox->addWidget(m_monitorRefresh); - render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, this); + render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, profile, this); m_monitorRefresh->setRenderer(render); #endif @@ -781,10 +783,10 @@ void Monitor::slotSaveZone() } -void Monitor::resetProfile() +void Monitor::resetProfile(const QString profile) { if (render == NULL) return; - render->resetProfile(); + render->resetProfile(profile); } void Monitor::saveSceneList(QString path, QDomElement info)