[beast: 1/7] BSE: rename Str1ngSeq to make room for new API
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast: 1/7] BSE: rename Str1ngSeq to make room for new API
- Date: Wed, 4 Nov 2015 22:48:35 +0000 (UTC)
commit e57e1e5ed4ce65a2eb6ce69d500a9dfc82dc4671
Author: Tim Janik <timj gnu org>
Date: Fri Sep 25 12:04:37 2015 +0200
BSE: rename Str1ngSeq to make room for new API
bse/bsebasics.idl | 4 ++--
bse/bseproject.cc | 10 +++++-----
bse/bseproject.hh | 2 +-
bse/bsewaverepo.proc | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/bse/bsebasics.idl b/bse/bsebasics.idl
index 37628ab..bdb43b9 100644
--- a/bse/bsebasics.idl
+++ b/bse/bsebasics.idl
@@ -23,7 +23,7 @@ Const MINDB = -96; /* 32bit:-192 24bit:-144 16bit:-96 */
sequence TypeSeq {
SfiString types;
};
-sequence StringSeq {
+sequence Str1ngSeq {
SfiString strings;
};
sequence FloatSeq {
@@ -396,7 +396,7 @@ record SampleFileInfo {
Int size = SfiInt ("File Size", "", 0, 0, G_MAXINT, 0, STANDARD);
Num mtime = SfiNum ("Modification Time", "", 0, 0, SFI_MAXNUM, 0, STANDARD);
SfiString loader = SfiString ("Loader", "", "", STANDARD);
- StringSeq waves = SfiSeq ("", "", STANDARD);
+ Str1ngSeq waves = SfiSeq ("", "", STANDARD);
Int error = SfiInt ("BseErrorType", "", 0, 0, G_MAXINT, 0, STANDARD); // FIXME: use
BseErrorType here
};
interface Janitor;
diff --git a/bse/bseproject.cc b/bse/bseproject.cc
index 415ba32..ab37d27 100644
--- a/bse/bseproject.cc
+++ b/bse/bseproject.cc
@@ -435,14 +435,14 @@ add_item_upaths (BseItem *item,
gpointer data_p)
{
gpointer *data = (void**) data_p;
- BseStringSeq *sseq = (BseStringSeq*) data[0];
+ BseStr1ngSeq *sseq = (BseStr1ngSeq*) data[0];
GType item_type = (GType) data[1];
BseContainer *container = (BseContainer*) data[2];
if (g_type_is_a (BSE_OBJECT_TYPE (item), item_type))
{
gchar *upath = bse_container_make_upath (container, item);
- bse_string_seq_append (sseq, upath);
+ bse_str1ng_seq_append (sseq, upath);
g_free (upath);
}
if (BSE_IS_CONTAINER (item))
@@ -451,17 +451,17 @@ add_item_upaths (BseItem *item,
return TRUE;
}
-BseStringSeq*
+BseStr1ngSeq*
bse_project_list_upaths (BseProject *self,
GType item_type)
{
gpointer data[3];
- BseStringSeq *sseq;
+ BseStr1ngSeq *sseq;
assert_return (BSE_IS_PROJECT (self), NULL);
assert_return (g_type_is_a (item_type, BSE_TYPE_ITEM), NULL);
- sseq = bse_string_seq_new ();
+ sseq = bse_str1ng_seq_new ();
data[0] = sseq;
data[1] = (gpointer) item_type;
data[2] = self;
diff --git a/bse/bseproject.hh b/bse/bseproject.hh
index 3967e71..8310920 100644
--- a/bse/bseproject.hh
+++ b/bse/bseproject.hh
@@ -50,7 +50,7 @@ void bse_project_keep_activated (BseProject *project,
guint64 min_tick);
void bse_project_state_changed (BseProject *project,
BseProjectState state);
-BseStringSeq* bse_project_list_upaths (BseProject *project,
+BseStr1ngSeq* bse_project_list_upaths (BseProject *project,
GType item_type);
Bse::ErrorType bse_project_restore (BseProject *project,
BseStorage *storage);
diff --git a/bse/bsewaverepo.proc b/bse/bsewaverepo.proc
index c207049..0eb1f02 100644
--- a/bse/bsewaverepo.proc
+++ b/bse/bsewaverepo.proc
@@ -138,7 +138,7 @@ BODY (BseProcedureClass *proc,
/* construct info */
BseSampleFileInfo info = { 0, };
info.file = (char*) filename;
- info.waves = bse_string_seq_new ();
+ info.waves = bse_str1ng_seq_new ();
if (stat (filename, &sbuf) < 0)
info.error = bse_error_from_errno (errno, Bse::ERROR_FILE_OPEN_FAILED);
else
@@ -150,7 +150,7 @@ BODY (BseProcedureClass *proc,
{
guint i;
for (i = 0; i < wfi->n_waves; i++)
- bse_string_seq_append (info.waves, wfi->waves[i].name);
+ bse_str1ng_seq_append (info.waves, wfi->waves[i].name);
info.loader = (gchar*) bse_wave_file_info_loader (wfi);
}
}
@@ -159,7 +159,7 @@ BODY (BseProcedureClass *proc,
bse_value_set_boxed (out_values++, &info);
/* cleanup */
- bse_string_seq_free (info.waves);
+ bse_str1ng_seq_free (info.waves);
if (wfi)
bse_wave_file_info_unref (wfi);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]