[beast: 6/26] BEAST: use WaveRepoImpl.list_children() and remove_wave() from bseapi.idl
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast: 6/26] BEAST: use WaveRepoImpl.list_children() and remove_wave() from bseapi.idl
- Date: Fri, 14 Oct 2016 15:48:29 +0000 (UTC)
commit 2fab6990e5c4a8283fd8990f4a04d66d25741e97
Author: Tim Janik <timj gnu org>
Date: Fri May 27 15:34:07 2016 +0200
BEAST: use WaveRepoImpl.list_children() and remove_wave() from bseapi.idl
Signed-off-by: Tim Janik <timj gnu org>
beast-gtk/bstfiledialog.cc | 5 ++---
beast-gtk/bstmain.cc | 6 ++++--
beast-gtk/bstwaveview.cc | 10 ++++++----
3 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/beast-gtk/bstfiledialog.cc b/beast-gtk/bstfiledialog.cc
index 11ad834..584a63c 100644
--- a/beast-gtk/bstfiledialog.cc
+++ b/beast-gtk/bstfiledialog.cc
@@ -727,10 +727,9 @@ static gboolean
bst_file_dialog_load_wave (BstFileDialog *self,
const gchar *file_name)
{
- Bse::Error error;
-
gxk_status_printf (0, NULL, _("Loading wave `%s'"), file_name);
- error = bse_wave_repo_load_file (self->wave_repo, file_name);
+ Bse::WaveRepoH repo = Bse::WaveRepoH::down_cast (bse_server.from_proxy (self->wave_repo));
+ Bse::Error error = repo.load_file (file_name);
bst_status_eprintf (error, _("Loading wave `%s'"), file_name);
if (error != 0)
sfi_error (_("Failed to load wave file \"%s\": %s"), file_name, Bse::error_blurb (error));
diff --git a/beast-gtk/bstmain.cc b/beast-gtk/bstmain.cc
index 5c7a81e..1bc3d8c 100644
--- a/beast-gtk/bstmain.cc
+++ b/beast-gtk/bstmain.cc
@@ -373,7 +373,8 @@ main_open_files (int filesc, char **filesv)
{
SfiProxy wrepo = bse_project_get_wave_repo (app->project.proxy_id());
gxk_status_printf (GXK_STATUS_WAIT, NULL, _("Loading \"%s\""), filesv[i]);
- Bse::Error error = bse_wave_repo_load_file (wrepo, filesv[i]);
+ Bse::WaveRepoH repo = Bse::WaveRepoH::down_cast (bse_server.from_proxy (wrepo));
+ Bse::Error error = repo.load_file (filesv[i]);
bst_status_eprintf (error, _("Loading \"%s\""), filesv[i]);
if (error != 0)
sfi_error (_("Failed to load wave file \"%s\": %s"), filesv[i], Bse::error_blurb (error));
@@ -382,7 +383,8 @@ main_open_files (int filesc, char **filesv)
{
Bse::ProjectH project = bse_server.create_project ("Untitled.bse");
SfiProxy wrepo = bse_project_get_wave_repo (project.proxy_id());
- Bse::Error error = bse_wave_repo_load_file (wrepo, filesv[i]);
+ Bse::WaveRepoH repo = Bse::WaveRepoH::down_cast (bse_server.from_proxy (wrepo));
+ Bse::Error error = repo.load_file (filesv[i]);
if (error == 0)
{
app = bst_app_new (project);
diff --git a/beast-gtk/bstwaveview.cc b/beast-gtk/bstwaveview.cc
index cb2e188..dd3a75c 100644
--- a/beast-gtk/bstwaveview.cc
+++ b/beast-gtk/bstwaveview.cc
@@ -124,13 +124,11 @@ bst_wave_view_set_editable (BstWaveView *self,
}
static void
-wave_view_action_exec (gpointer data,
- size_t action)
+wave_view_action_exec (gpointer data, size_t action)
{
BstWaveView *self = BST_WAVE_VIEW (data);
BstItemView *item_view = BST_ITEM_VIEW (self);
SfiProxy wrepo = item_view->container;
-
switch (action)
{
SfiProxy item;
@@ -142,7 +140,11 @@ wave_view_action_exec (gpointer data,
break;
case ACTION_DELETE_WAVE:
item = bst_item_view_get_current (BST_ITEM_VIEW (self));
- bse_wave_repo_remove_wave (wrepo, item);
+ {
+ Bse::WaveRepoH repo = Bse::WaveRepoH::down_cast (bse_server.from_proxy (wrepo));
+ Bse::WaveH wave = Bse::WaveH::down_cast (bse_server.from_proxy (item));
+ repo.remove_wave (wave);
+ }
break;
case ACTION_EDIT_WAVE:
popup_wave_dialog (self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]