I often search for tracks by album name - not just artist and title.
This patch
extends the search functionality to include album name.
I noticed a plus was missing in old code. Does C++ cope with this itself? or
was this an undiscovered bug?
Regards
Graeme
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mathi...@mathieg2-sony32-20100510221610-\
# e3ys8ubt998k20wb
# target_branch: http://bazaar.launchpad.net/~mixxxdevelopers/mixxx\
# /trunk/
# testament_sha1: f2954a489bb8e7021a8c7371ea9690fca1adc4eb
# timestamp: 2010-05-10 23:50:37 +0100
# base_revision_id: [email protected]\
# dnc23uq2ck92i6h6
#
# Begin patch
=== modified file 'mixxx/src/library/cratetablemodel.cpp'
--- mixxx/src/library/cratetablemodel.cpp 2010-04-04 04:21:54 +0000
+++ mixxx/src/library/cratetablemodel.cpp 2010-05-10 22:16:10 +0000
@@ -158,7 +158,8 @@
search.setValue("%" + searchText + "%");
QString escapedText = database().driver()->formatValue(search);
filter = "(" + LibraryTableModel::DEFAULT_LIBRARYFILTER + " AND " +
- "(artist LIKE " + escapedText + " OR "
+ "(artist LIKE " + escapedText + " OR " +
+ "album LIKE " + escapedText + " OR " +
"title LIKE " + escapedText + "))";
}
=== modified file 'mixxx/src/library/librarytablemodel.cpp'
--- mixxx/src/library/librarytablemodel.cpp 2010-04-03 23:26:07 +0000
+++ mixxx/src/library/librarytablemodel.cpp 2010-05-10 22:16:10 +0000
@@ -121,7 +121,8 @@
search.setValue("%" + searchText + "%");
QString escapedText = database().driver()->formatValue(search);
filter = "(" + LibraryTableModel::DEFAULT_LIBRARYFILTER + " AND " +
- "(artist LIKE " + escapedText + " OR "
+ "(artist LIKE " + escapedText + " OR " +
+ "album LIKE " + escapedText + " OR " +
"title LIKE " + escapedText + "))";
}
setFilter(filter);
=== modified file 'mixxx/src/library/missingtablemodel.cpp'
--- mixxx/src/library/missingtablemodel.cpp 2010-04-03 23:26:07 +0000
+++ mixxx/src/library/missingtablemodel.cpp 2010-05-10 22:16:10 +0000
@@ -141,7 +141,8 @@
search.setValue("%" + searchText + "%");
QString escapedText = database().driver()->formatValue(search);
filter = "(" + LibraryTableModel::DEFAULT_LIBRARYFILTER + " AND " +
- "(artist LIKE " + escapedText + " OR "
+ "(artist LIKE " + escapedText + " OR " +
+ "album LIKE " + escapedText + " OR " +
"title LIKE " + escapedText + "))";
}
setFilter(filter);
=== modified file 'mixxx/src/library/playlisttablemodel.cpp'
--- mixxx/src/library/playlisttablemodel.cpp 2010-04-04 04:21:54 +0000
+++ mixxx/src/library/playlisttablemodel.cpp 2010-05-10 22:16:10 +0000
@@ -286,7 +286,8 @@
search.setValue("%" + searchText + "%");
QString escapedText = database().driver()->formatValue(search);
filter = "(" + LibraryTableModel::DEFAULT_LIBRARYFILTER + " AND " +
- "(artist LIKE " + escapedText + " OR "
+ "(artist LIKE " + escapedText + " OR " +
+ "album LIKE " + escapedText + " OR " +
"title LIKE " + escapedText + "))";
}
setFilter(filter);
=== modified file 'mixxx/src/library/preparelibrarytablemodel.cpp'
--- mixxx/src/library/preparelibrarytablemodel.cpp 2010-01-31 07:32:27
+0000
+++ mixxx/src/library/preparelibrarytablemodel.cpp 2010-05-10 22:16:10
+0000
@@ -60,7 +60,8 @@
search.setValue("%" + searchText + "%");
QString escapedText = database().driver()->formatValue(search);
filter = "(" + baseFilter + " AND " +
- "(artist LIKE " + escapedText + " OR "
+ "(artist LIKE " + escapedText + " OR " +
+ "album LIKE " + escapedText + " OR " +
"title LIKE " + escapedText + "))";
}
setFilter(filter);
# Begin bundle
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
EBXGJKwX6Em4v7TSewu5IpwoSAe3nsGA
------------------------------------------------------------------------------
_______________________________________________
Mixxx-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mixxx-devel
