X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprofilesdialog.cpp;h=e85b0e45c48fafb5dcda4fb9e667a3f90341e101;hb=024a8b00915dadce2a470f3802101542528513f0;hp=6bec5c5badf1a48e3bbe3340a0840037470591f4;hpb=c1b450a1e3621149b10d1d34b2735087dcacdcef;p=kdenlive diff --git a/src/profilesdialog.cpp b/src/profilesdialog.cpp index 6bec5c5b..e85b0e45 100644 --- a/src/profilesdialog.cpp +++ b/src/profilesdialog.cpp @@ -57,26 +57,30 @@ MltVideoProfile ProfilesDialog::getVideoProfile(QString name) { QStringList profilesFilter; profilesFilter << "*"; QString path; + bool isCustom = false; + if (name.contains('/')) isCustom = true; - // List the Mlt profiles - profilesFiles = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); - if (profilesFiles.contains(name)) path = KdenliveSettings::mltpath() + "/" + name; - - if (path.isEmpty()) { + if (!isCustom) { + // List the Mlt profiles + profilesFiles = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); + if (profilesFiles.contains(name)) path = KdenliveSettings::mltpath() + "/" + name; + } + if (isCustom || path.isEmpty()) { // List custom profiles - QStringList customProfiles = KGlobal::dirs()->findDirs("appdata", "profiles"); - for (int i = 0; i < customProfiles.size(); ++i) { - profilesFiles = QDir(customProfiles.at(i)).entryList(profilesFilter, QDir::Files); - if (profilesFiles.contains(name)) { - path = customProfiles.at(i) + "/" + name; - break; - } - } + path = name; + /* QStringList customProfiles = KGlobal::dirs()->findDirs("appdata", "profiles"); + for (int i = 0; i < customProfiles.size(); ++i) { + profilesFiles = QDir(customProfiles.at(i)).entryList(profilesFilter, QDir::Files); + if (profilesFiles.contains(name)) { + path = customProfiles.at(i) + "/" + name; + break; + } + }*/ } if (path.isEmpty()) return result; KConfig confFile(path); - result.path = path; + result.path = name; result.description = confFile.entryMap().value("description"); result.frame_rate_num = confFile.entryMap().value("frame_rate_num").toInt(); result.frame_rate_den = confFile.entryMap().value("frame_rate_den").toInt();