jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #437 from kc5nra/fix-ffmpeg-output

Browse Source 
UI: Fix settings reload selecting  wrong fmt/codec
This commit is contained in:
Jim 2015-06-14 15:32:50 -07:00
commit 92cae0c511
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
obs/window-basic-settings.cpp
View File

@ -45,6 +45,10 @@ using namespace std;
// Used for QVariant in codec comboboxes // Used for QVariant in codec comboboxes
namespace { namespace {
static bool StringEquals(QString left, QString right)
{
return left == right;
}
struct FormatDesc { struct FormatDesc {
const char *name = nullptr; const char *name = nullptr;
const char *mimeType = nullptr; const char *mimeType = nullptr;
@ -57,15 +61,9 @@ struct FormatDesc {
bool operator==(const FormatDesc &f) const bool operator==(const FormatDesc &f) const
{ {
if ((name == nullptr) ^ (f.name == nullptr)) if (!StringEquals(name, f.name))
return false; return false;
if (name != nullptr && strcmp(name, f.name) != 0) return StringEquals(mimeType, f.mimeType);
return false;
if ((mimeType == nullptr) ^ (f.mimeType == nullptr))
return false;
if (mimeType != nullptr && strcmp(mimeType, f.mimeType) != 0)
return false;
return true;
} }
}; };
struct CodecDesc { struct CodecDesc {
@ -77,11 +75,9 @@ struct CodecDesc {
bool operator==(const CodecDesc &codecDesc) const bool operator==(const CodecDesc &codecDesc) const
{ {
if ((name == nullptr) ^ (codecDesc.name == nullptr))
return false;
if (id != codecDesc.id) if (id != codecDesc.id)
return false; return false;
return name == nullptr || strcmp(name, codecDesc.name) == 0; return StringEquals(name, codecDesc.name);
} }
}; };
} }