[rygel/wip/no-value-array: 2/3] media-export, lms: Get rid of ValueArray
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel/wip/no-value-array: 2/3] media-export, lms: Get rid of ValueArray
- Date: Sat, 30 Apr 2022 12:18:59 +0000 (UTC)
commit a5f1316e1597359a96a46bb0b6b7ca4268fce53c
Author: Jens Georg <mail jensge org>
Date: Wed Sep 15 21:27:57 2021 +0200
media-export,lms: Get rid of ValueArray
meson.build | 2 +-
src/plugins/lms/rygel-lms-albums.vala | 8 ++--
src/plugins/lms/rygel-lms-category-container.vala | 22 +++++-----
.../rygel-media-export-media-cache.vala | 50 +++++++++++-----------
4 files changed, 41 insertions(+), 41 deletions(-)
---
diff --git a/meson.build b/meson.build
index 8af2fcf9e..42fefeecd 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project('rygel', 'vala', 'c', version : '0.41.0', meson_version : '>= 0.55.0')
vala = meson.get_compiler('vala')
# Check for the required vala version
-vala_version_required = '>= 0.40.10'
+vala_version_required = '>= 0.53.2'
vala_version_found = vala.version()
if not vala_version_found.version_compare(vala_version_required)
diff --git a/src/plugins/lms/rygel-lms-albums.vala b/src/plugins/lms/rygel-lms-albums.vala
index f76648b2f..3a886f28e 100644
--- a/src/plugins/lms/rygel-lms-albums.vala
+++ b/src/plugins/lms/rygel-lms-albums.vala
@@ -96,7 +96,7 @@ public class Rygel.LMS.Albums : Rygel.LMS.CategoryContainer {
}
protected override uint get_child_count_with_filter (string where_filter,
- ValueArray args) {
+ GLib.Array<GLib.Value> args) {
/* search the children (albums) as usual */
var count = base.get_child_count_with_filter (where_filter, args);
@@ -108,7 +108,7 @@ public class Rygel.LMS.Albums : Rygel.LMS.CategoryContainer {
}
var query = Albums.SQL_CHILD_COUNT_WITH_FILTER_TEMPLATE.printf (filter);
try {
- count += this.lms_db.query_value (query, args.values);
+ count += this.lms_db.query_value (query, args.data);
} catch (DatabaseError e) {
warning ("Query failed: %s", e.message);
}
@@ -118,7 +118,7 @@ public class Rygel.LMS.Albums : Rygel.LMS.CategoryContainer {
protected override MediaObjects? get_children_with_filter
(string where_filter,
- ValueArray args,
+ GLib.Array<GLib.Value> args,
string sort_criteria,
uint offset,
uint max_count) {
@@ -133,7 +133,7 @@ public class Rygel.LMS.Albums : Rygel.LMS.CategoryContainer {
}
var query = Albums.SQL_CHILD_ALL_WITH_FILTER_TEMPLATE.printf (filter);
try {
- var cursor = this.lms_db.exec_cursor (query, args.values);
+ var cursor = this.lms_db.exec_cursor (query, args.data);
foreach (var stmt in cursor) {
var album_id = stmt.column_text (13);
var album = new Album (album_id, this, "", this.lms_db);
diff --git a/src/plugins/lms/rygel-lms-category-container.vala
b/src/plugins/lms/rygel-lms-category-container.vala
index 46456db27..239e89ec9 100644
--- a/src/plugins/lms/rygel-lms-category-container.vala
+++ b/src/plugins/lms/rygel-lms-category-container.vala
@@ -104,7 +104,7 @@ public abstract class Rygel.LMS.CategoryContainer : Rygel.MediaContainer,
private static string? relational_expression_to_sql
(RelationalExpression exp,
- GLib.ValueArray args)
+ GLib.Array<GLib.Value> args)
throws Error {
GLib.Value? v = null;
string collate = null;
@@ -151,7 +151,7 @@ public abstract class Rygel.LMS.CategoryContainer : Rygel.MediaContainer,
}
if (v != null) {
- args.append (v);
+ args.append_val (v);
}
return operator.to_string ();
@@ -159,7 +159,7 @@ public abstract class Rygel.LMS.CategoryContainer : Rygel.MediaContainer,
private static string logical_expression_to_sql
(LogicalExpression expression,
- GLib.ValueArray args)
+ GLib.Array<GLib.Value> args)
throws Error {
string left_sql_string = CategoryContainer.search_expression_to_sql
(expression.operand1,
@@ -180,7 +180,7 @@ public abstract class Rygel.LMS.CategoryContainer : Rygel.MediaContainer,
private static string? search_expression_to_sql
(SearchExpression? expression,
- GLib.ValueArray args)
+ GLib.Array<GLib.Value> args)
throws Error {
if (expression == null) {
return "";
@@ -197,11 +197,11 @@ public abstract class Rygel.LMS.CategoryContainer : Rygel.MediaContainer,
}
protected virtual uint get_child_count_with_filter (string where_filter,
- ValueArray args)
+ GLib.Array<GLib.Value> args)
{
var query = this.get_sql_count_with_filter (where_filter);
try {
- return this.lms_db.query_value (query, args.values);
+ return this.lms_db.query_value (query, args.data);
} catch (DatabaseError e) {
warning ("Query failed: %s", e.message);
@@ -211,19 +211,19 @@ public abstract class Rygel.LMS.CategoryContainer : Rygel.MediaContainer,
protected virtual MediaObjects? get_children_with_filter
(string where_filter,
- ValueArray args,
+ GLib.Array<GLib.Value> args,
string sort_criteria,
uint offset,
uint max_count) {
var children = new MediaObjects ();
GLib.Value v = max_count;
- args.append (v);
+ args.append_val (v);
v = offset;
- args.append (v);
+ args.append_val (v);
var query = this.get_sql_all_with_filter (where_filter);
try {
- var cursor = this.lms_db.exec_cursor (query, args.values);
+ var cursor = this.lms_db.exec_cursor (query, args.data);
foreach (var stmt in cursor) {
children.add (this.object_from_statement (stmt));
}
@@ -243,7 +243,7 @@ public abstract class Rygel.LMS.CategoryContainer : Rygel.MediaContainer,
throws Error {
debug ("search()");
try {
- var args = new GLib.ValueArray (0);
+ var args = new GLib.Array<GLib.Value> ();
var filter = CategoryContainer.search_expression_to_sql (expression,
args);
total_matches = this.get_child_count_with_filter (filter, args);
diff --git a/src/plugins/media-export/rygel-media-export-media-cache.vala
b/src/plugins/media-export/rygel-media-export-media-cache.vala
index a905bc5aa..13bbcbb0c 100644
--- a/src/plugins/media-export/rygel-media-export-media-cache.vala
+++ b/src/plugins/media-export/rygel-media-export-media-cache.vala
@@ -282,7 +282,7 @@ public class Rygel.MediaExport.MediaCache : Object {
uint max_count,
out uint total_matches)
throws Error {
- var args = new GLib.ValueArray (0);
+ var args = new GLib.Array<GLib.Value> ();
var filter = MediaCache.translate_search_expression (expression, args);
if (expression != null) {
@@ -307,7 +307,7 @@ public class Rygel.MediaExport.MediaCache : Object {
(SearchExpression? expression,
string? container_id)
throws Error {
- var args = new GLib.ValueArray (0);
+ var args = new GLib.Array<GLib.Value> ();
var filter = MediaCache.translate_search_expression (expression, args);
if (expression != null) {
@@ -315,8 +315,8 @@ public class Rygel.MediaExport.MediaCache : Object {
debug ("Parsed search expression: %s", filter);
}
- for (int i = 0; i < args.n_values; i++) {
- var arg = args.get_nth (i);
+ for (int i = 0; i < args.length; i++) {
+ var arg = args.index (i);
debug ("Arg %d: %s", i, arg.holds (typeof (string)) ?
arg.get_string () :
arg.strdup_contents ());
@@ -329,15 +329,15 @@ public class Rygel.MediaExport.MediaCache : Object {
public long get_object_count_by_filter
(string filter,
- GLib.ValueArray args,
+ GLib.Array<GLib.Value> args,
string? container_id)
throws Error {
if (container_id != null) {
GLib.Value v = container_id;
- args.prepend (v);
+ args.prepend_val (v);
}
- debug ("Parameters to bind: %u", args.n_values);
+ debug ("Parameters to bind: %u", args.length);
unowned string pattern;
SQLString string_id;
if (container_id != null) {
@@ -347,11 +347,11 @@ public class Rygel.MediaExport.MediaCache : Object {
}
pattern = this.sql.make (string_id);
- return this.db.query_value (pattern.printf (filter), args.values);
+ return this.db.query_value (pattern.printf (filter), args.data);
}
public MediaObjects get_objects_by_filter (string filter,
- GLib.ValueArray args,
+ GLib.Array<GLib.Value> args,
string? container_id,
string sort_criteria,
long offset,
@@ -359,14 +359,14 @@ public class Rygel.MediaExport.MediaCache : Object {
throws Error {
var children = new MediaObjects ();
GLib.Value v = offset;
- args.append (v);
+ args.append_val (v);
v = max_count;
- args.append (v);
+ args.append_val (v);
MediaContainer parent = null;
- debug ("Parameters to bind: %u", args.n_values);
- for (int i = 0; i < args.n_values; i++) {
- var arg = args.get_nth (i);
+ debug ("Parameters to bind: %u", args.length);
+ for (int i = 0; i < args.length; i++) {
+ var arg = args.index (i);
debug ("Arg %d: %s", i, arg.holds (typeof (string)) ?
arg.get_string () :
arg.strdup_contents ());
@@ -381,7 +381,7 @@ public class Rygel.MediaExport.MediaCache : Object {
var sort_order = MediaCache.translate_sort_criteria (sort_criteria);
var cursor = this.db.exec_cursor (sql.printf (filter, sort_order),
- args.values);
+ args.data);
foreach (var statement in cursor) {
unowned string parent_id = statement.column_text (DetailColumn.PARENT);
@@ -437,16 +437,16 @@ public class Rygel.MediaExport.MediaCache : Object {
public Gee.List<string> get_meta_data_column_by_filter
(string column,
string filter,
- GLib.ValueArray args,
+ GLib.Array<GLib.Value> args,
long offset,
string sort_criteria,
long max_count,
bool add_all_container)
throws Error {
GLib.Value v = offset;
- args.append (v);
+ args.append_val (v);
v = max_count;
- args.append (v);
+ args.append_val (v);
string extra_columns;
int column_count;
@@ -478,7 +478,7 @@ public class Rygel.MediaExport.MediaCache : Object {
filter,
sql_sort_order);
- var cursor = this.db.exec_cursor (builder.str, args.values);
+ var cursor = this.db.exec_cursor (builder.str, args.data);
foreach (var statement in cursor) {
data.add (statement.column_text (0));
}
@@ -497,7 +497,7 @@ public class Rygel.MediaExport.MediaCache : Object {
uint max_count,
bool add_all_container)
throws Error {
- var args = new ValueArray (0);
+ var args = new Array<GLib.Value> ();
var filter = MediaCache.translate_search_expression (expression,
args,
"AND");
@@ -1006,7 +1006,7 @@ public class Rygel.MediaExport.MediaCache : Object {
private static string translate_search_expression
(SearchExpression? expression,
- ValueArray args,
+ Array<GLib.Value> args,
string prefix = "WHERE")
throws Error {
if (expression == null) {
@@ -1020,7 +1020,7 @@ public class Rygel.MediaExport.MediaCache : Object {
private static string? search_expression_to_sql
(SearchExpression? expression,
- GLib.ValueArray args)
+ GLib.Array<GLib.Value> args)
throws Error {
if (expression == null) {
return "";
@@ -1038,7 +1038,7 @@ public class Rygel.MediaExport.MediaCache : Object {
private static string logical_expression_to_sql
(LogicalExpression expression,
- GLib.ValueArray args)
+ GLib.Array<GLib.Value> args)
throws Error {
string left_sql_string = MediaCache.search_expression_to_sql
(expression.operand1,
@@ -1139,7 +1139,7 @@ public class Rygel.MediaExport.MediaCache : Object {
private static string? relational_expression_to_sql
(RelationalExpression exp,
- GLib.ValueArray args)
+ GLib.Array<GLib.Value> args)
throws Error {
GLib.Value? v = null;
string collate = null;
@@ -1187,7 +1187,7 @@ public class Rygel.MediaExport.MediaCache : Object {
}
if (v != null) {
- args.append (v);
+ args.append_val (v);
}
return operator.to_string ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
