X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.cc;h=272b983d90c8bf5e72c81e00c3b38ef3e9791163;hp=562ea8f3895d0d67423ee135ae8b76bf4ef35900;hb=ed0b5670e65647a9f0555ed66f81125678d193a7;hpb=09287979ce90e809880cd17fb20deb23669f68e4

diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 562ea8f38..272b983d9 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -29,11 +29,6 @@
 #include "lib/scope_guard.h"
 #include "lib/screen.h"
 #include "lib/timer.h"
-#include <unicode/putil.h>
-#include <unicode/ucol.h>
-#include <unicode/uiter.h>
-#include <unicode/utypes.h>
-#include <unicode/ustring.h>
 
 
 using std::cout;
@@ -120,14 +115,6 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
 
 	SetSizer (sizer);
 
-	UErrorCode status = U_ZERO_ERROR;
-	_collator = ucol_open(nullptr, &status);
-	if (_collator) {
-		ucol_setAttribute(_collator, UCOL_NORMALIZATION_MODE, UCOL_ON, &status);
-		ucol_setAttribute(_collator, UCOL_STRENGTH, UCOL_PRIMARY, &status);
-		ucol_setAttribute(_collator, UCOL_ALTERNATE_HANDLING, UCOL_SHIFTED, &status);
-	}
-
 	_config_connection = Config::instance()->Changed.connect(boost::bind(&ScreensPanel::config_changed, this, _1));
 }
 
@@ -136,10 +123,6 @@ ScreensPanel::~ScreensPanel ()
 {
 	_targets->Unbind (wxEVT_TREELIST_SELECTION_CHANGED, &ScreensPanel::selection_changed_shim, this);
 	_targets->Unbind (wxEVT_TREELIST_ITEM_CHECKED, &ScreensPanel::checkbox_changed, this);
-
-	if (_collator) {
-		ucol_close (_collator);
-	}
 }
 
 
@@ -184,18 +167,33 @@ ScreensPanel::setup_sensitivity ()
 }
 
 
+void
+ScreensPanel::convert_to_lower(string& s)
+{
+	transform(s.begin(), s.end(), s.begin(), ::tolower);
+}
+
+
+bool
+ScreensPanel::matches_search(shared_ptr<const Cinema> cinema, string lower_case_search)
+{
+	if (lower_case_search.empty()) {
+		return true;
+	}
+
+	auto name = cinema->name;
+	convert_to_lower(name);
+	return name.find(lower_case_search) != string::npos;
+}
+
+
 optional<wxTreeListItem>
 ScreensPanel::add_cinema (shared_ptr<Cinema> cinema, wxTreeListItem previous)
 {
 	auto search = wx_to_std (_search->GetValue ());
-	transform (search.begin(), search.end(), search.begin(), ::tolower);
-
-	if (!search.empty ()) {
-		auto name = cinema->name;
-		transform (name.begin(), name.end(), name.begin(), ::tolower);
-		if (name.find (search) == string::npos) {
-			return {};
-		}
+	convert_to_lower(search);
+	if (!matches_search(cinema, search)) {
+		return {};
 	}
 
 	auto id = _targets->InsertItem(_targets->GetRootItem(), previous, std_to_wx(cinema->name));
@@ -239,7 +237,7 @@ ScreensPanel::add_cinema_clicked ()
 
 		auto cinemas = Config::instance()->cinemas();
 		cinemas.sort(
-			[this](shared_ptr<Cinema> a, shared_ptr<Cinema> b) { return compare(a->name, b->name) < 0; }
+			[this](shared_ptr<Cinema> a, shared_ptr<Cinema> b) { return _collator.compare(a->name, b->name) < 0; }
 			);
 
 		try {
@@ -254,7 +252,7 @@ ScreensPanel::add_cinema_clicked ()
 		wxTreeListItem previous = wxTLI_FIRST;
 		bool found = false;
 		for (auto existing_cinema: cinemas) {
-			if (compare(dialog->name(), existing_cinema->name) < 0) {
+			if (_collator.compare(dialog->name(), existing_cinema->name) < 0) {
 				/* existing_cinema should be after the one we're inserting */
 				found = true;
 				break;
@@ -502,7 +500,7 @@ ScreensPanel::add_cinemas ()
 {
 	auto cinemas = Config::instance()->cinemas();
 	cinemas.sort(
-		[this](shared_ptr<Cinema> a, shared_ptr<Cinema> b) { return compare(a->name, b->name) < 0; }
+		[this](shared_ptr<Cinema> a, shared_ptr<Cinema> b) { return _collator.compare(a->name, b->name) < 0; }
 		);
 
 	for (auto cinema: cinemas) {
@@ -667,22 +665,6 @@ ScreensPanel::screen_to_item (shared_ptr<Screen> screen) const
 }
 
 
-int
-ScreensPanel::compare (string const& utf8_a, string const& utf8_b)
-{
-	if (_collator) {
-		UErrorCode error = U_ZERO_ERROR;
-		boost::scoped_array<uint16_t> utf16_a(new uint16_t[utf8_a.size() + 1]);
-		u_strFromUTF8(reinterpret_cast<UChar*>(utf16_a.get()), utf8_a.size() + 1, nullptr, utf8_a.c_str(), -1, &error);
-		boost::scoped_array<uint16_t> utf16_b(new uint16_t[utf8_b.size() + 1]);
-		u_strFromUTF8(reinterpret_cast<UChar*>(utf16_b.get()), utf8_b.size() + 1, nullptr, utf8_b.c_str(), -1, &error);
-		return ucol_strcoll(_collator, reinterpret_cast<UChar*>(utf16_a.get()), -1, reinterpret_cast<UChar*>(utf16_b.get()), -1);
-	} else {
-		return strcoll(utf8_a.c_str(), utf8_b.c_str());
-	}
-}
-
-
 bool
 ScreensPanel::notify_cinemas_changed()
 {
@@ -707,5 +689,3 @@ ScreensPanel::config_changed(Config::Property property)
 		clear_and_re_add();
 	}
 }
-
-