svn path=/trunk/kdenlive/; revision=5098
KdenliveSettings::setRmd_freq(value);
}
KdenliveSettings::setRmd_freq(value);
}
+ if (m_configSdl.kcfg_external_display->isChecked() != KdenliveSettings::external_display()) {
+ KdenliveSettings::setExternal_display(m_configSdl.kcfg_external_display->isChecked());
+ resetProfile = true;
+ }
+
value = m_configSdl.kcfg_audio_driver->itemData(m_configSdl.kcfg_audio_driver->currentIndex()).toString();
if (value != KdenliveSettings::audiodrivername()) {
KdenliveSettings::setAudiodrivername(value);
value = m_configSdl.kcfg_audio_driver->itemData(m_configSdl.kcfg_audio_driver->currentIndex()).toString();
if (value != KdenliveSettings::audiodrivername()) {
KdenliveSettings::setAudiodrivername(value);
m_mltProducer(NULL),
m_mltProfile(NULL),
m_framePosition(0),
m_mltProducer(NULL),
m_mltProfile(NULL),
m_framePosition(0),
+ m_externalConsumer(false),
m_isZoneMode(false),
m_isLoopMode(false),
m_isSplitView(false),
m_isZoneMode(false),
m_isLoopMode(false),
m_isSplitView(false),
m_mltConsumer = new Mlt::Consumer(*m_mltProfile, tmp);
delete[] tmp;
if (m_mltConsumer) {
m_mltConsumer = new Mlt::Consumer(*m_mltProfile, tmp);
delete[] tmp;
if (m_mltConsumer) {
+ m_externalConsumer = true;
m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
m_mltConsumer->set("terminate_on_pause", 0);
m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
m_mltConsumer->set("terminate_on_pause", 0);
- m_mltConsumer->set("audio_buffer", 1024);
- m_mltConsumer->set("frequency", 48000);
mlt_log_set_callback(kdenlive_callback);
}
if (m_mltConsumer && m_mltConsumer->is_valid()) return;
} else KMessageBox::informationList(qApp->activeWindow(), i18n("Your project's profile %1 is not compatible with the blackmagic output card. Please see supported profiles below. Switching to normal video display.", m_mltProfile->description()), BMInterface::supportedModes(KdenliveSettings::blackmagic_output_device()));
}
mlt_log_set_callback(kdenlive_callback);
}
if (m_mltConsumer && m_mltConsumer->is_valid()) return;
} else KMessageBox::informationList(qApp->activeWindow(), i18n("Your project's profile %1 is not compatible with the blackmagic output card. Please see supported profiles below. Switching to normal video display.", m_mltProfile->description()), BMInterface::supportedModes(KdenliveSettings::blackmagic_output_device()));
}
+ m_externalConsumer = false;
QString videoDriver = KdenliveSettings::videodrivername();
if (!videoDriver.isEmpty()) {
if (videoDriver == "x11_noaccel") {
QString videoDriver = KdenliveSettings::videodrivername();
if (!videoDriver.isEmpty()) {
if (videoDriver == "x11_noaccel") {
int Render::resetProfile(const QString profileName)
{
if (m_mltConsumer) {
int Render::resetProfile(const QString profileName)
{
if (m_mltConsumer) {
- if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1;
- QString videoDriver = KdenliveSettings::videodrivername();
- QString currentDriver = m_mltConsumer->get("video_driver");
- if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel";
- QString background = KdenliveSettings::window_background().name();
- QString currentBackground = m_mltConsumer->get("window_background");
- if (m_activeProfile == profileName && currentDriver == videoDriver && background == currentBackground) {
- kDebug() << "reset to same profile, nothing to do";
- return 1;
+ if (m_externalConsumer == KdenliveSettings::external_display()) {
+ if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1;
+ QString videoDriver = KdenliveSettings::videodrivername();
+ QString currentDriver = m_mltConsumer->get("video_driver");
+ if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel";
+ QString background = KdenliveSettings::window_background().name();
+ QString currentBackground = m_mltConsumer->get("window_background");
+ if (m_activeProfile == profileName && currentDriver == videoDriver && background == currentBackground) {
+ kDebug() << "reset to same profile, nothing to do";
+ return 1;
+ }
}
if (m_isSplitView) slotSplitView(false);
}
if (m_isSplitView) slotSplitView(false);
Mlt::Profile *m_mltProfile;
double m_framePosition;
double m_fps;
Mlt::Profile *m_mltProfile;
double m_framePosition;
double m_fps;
+ bool m_externalConsumer;
/** @brief True if we are playing a zone.
*
/** @brief True if we are playing a zone.
*