searchable: retrieve currently applied search constraint

1 files changed, 11 insertions, 5 deletions

diff --git a/src/playlist.cpp b/src/playlist.cpp
index 9dd9bcc3..b8994182 100644
--- a/src/playlist.cpp
+++ b/src/playlist.cpp
@@ -153,21 +153,27 @@ bool Playlist::allowsSearching()
 	return true;
 }
 
+const std::string &Playlist::searchConstraint()
+{
+	return m_search_predicate.constraint();
+}
+
 void Playlist::setSearchConstraint(const std::string &constraint)
 {
 	m_search_predicate = Regex::Filter<MPD::Song>(
-		Regex::make(constraint, Config.regex_type), playlistEntryMatcher
-	);
+		constraint,
+		Config.regex_type,
+		playlistEntryMatcher);
 }
 
-void Playlist::clearConstraint()
+void Playlist::clearSearchConstraint()
 {
 	m_search_predicate.clear();
 }
 
-bool Playlist::find(SearchDirection direction, bool wrap, bool skip_current)
+bool Playlist::search(SearchDirection direction, bool wrap, bool skip_current)
 {
-	return search(w, m_search_predicate, direction, wrap, skip_current);
+	return ::search(w, m_search_predicate, direction, wrap, skip_current);
 }
 
 /***********************************************************************/