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

filter duplicate resolutions

Browse Source
This commit is contained in:
Palana 2013-12-17 18:44:02 +01:00
parent 197c56c9ae
commit e563931e9f
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
obs/settings-basic-video.cpp
View File

@ -24,6 +24,7 @@
#include "platform.hpp"
#include <sstream>
#include <unordered_set>
using namespace std;
class BasicVideoData : public BasicSettingsData {
@ -127,6 +128,14 @@ void BasicVideoData::LoadOther()
window->rendererList->SetSelection(sel);
}
namespace
{
uint64_t append_uint32_t(uint64_t first, uint64_t second)
{
return (first << 32) | second;
}
}
void BasicVideoData::LoadResolutionData()
{
window->baseResList->Clear();
@ -136,8 +145,12 @@ void BasicVideoData::LoadResolutionData()
vector<MonitorInfo> monitors;
GetMonitors(monitors);
for (size_t i = 0; i < monitors.size(); i++)
AddRes(monitors[i].cx, monitors[i].cy);
unordered_set<uint64_t> resolutions;
for (size_t i = 0; i < monitors.size(); i++) {
uint64_t res = append_uint32_t(monitors[i].cx, monitors[i].cy);
if(resolutions.emplace(res).second)
AddRes(monitors[i].cx, monitors[i].cy);
}
stringstream res;
res << cx << "x" << cy;