[beast: 4/29] BEAST: use Bse::Error::* instead of Bse::ERROR_*

From: Tim Janik <timj src gnome org>
To: commits-list gnome org
Cc:
Subject: [beast: 4/29] BEAST: use Bse::Error::* instead of Bse::ERROR_*
Date: Mon, 21 Mar 2016 15:11:59 +0000 (UTC)
commit 0921456f9cbe09dd9b687da91922b10a1603f3ff
Author: Tim Janik <timj gnu org>
Date:   Thu Jan 28 00:45:23 2016 +0100

    BEAST: use Bse::Error::* instead of Bse::ERROR_*
    
    Signed-off-by: Tim Janik <timj gnu org>

 beast-gtk/bsteventrollctrl.cc |   12 ++++++------
 beast-gtk/bstfiledialog.cc    |   12 ++++++------
 beast-gtk/bstgconfig.cc       |   14 +++++++-------
 beast-gtk/bstkeybindings.cc   |   14 +++++++-------
 beast-gtk/bstmain.cc          |    4 ++--
 beast-gtk/bstmsgabsorb.cc     |   14 +++++++-------
 beast-gtk/bstpianorollctrl.cc |   10 +++++-----
 beast-gtk/bstpreferences.cc   |    4 ++--
 beast-gtk/bstprocedure.cc     |    2 +-
 beast-gtk/bstskinconfig.cc    |   14 +++++++-------
 beast-gtk/bstsnetrouter.cc    |    2 +-
 beast-gtk/bsttreestores.cc    |    4 ++--
 beast-gtk/bstwaveeditor.cc    |    2 +-
 13 files changed, 54 insertions(+), 54 deletions(-)
---
diff --git a/beast-gtk/bsteventrollctrl.cc b/beast-gtk/bsteventrollctrl.cc
index 740fdf6..57ee2ea 100644
--- a/beast-gtk/bsteventrollctrl.cc
+++ b/beast-gtk/bsteventrollctrl.cc
@@ -465,7 +465,7 @@ move_motion (BstEventRollController *self,
       const Bse::PartControlSeq &cseq = part.get_controls (new_tick, CONTROL_TYPE (self));
       if (!cseq.size()) // avoid overlap
         {
-          if (part.change_control (self->obj_id, new_tick, CONTROL_TYPE (self), self->obj_value) != 
Bse::ERROR_NONE)
+          if (part.change_control (self->obj_id, new_tick, CONTROL_TYPE (self), self->obj_value) != 
Bse::Error::NONE)
             drag->state = GXK_DRAG_ERROR;
           else
             self->obj_tick = new_tick;
@@ -528,7 +528,7 @@ insert_start (BstEventRollController *self,
              BstEventRollDrag       *drag)
 {
   Bse::PartH part = self->eroll->part;
-  Bse::ErrorType error = Bse::ERROR_INVALID_OVERLAP;
+  Bse::ErrorType error = Bse::Error::INVALID_OVERLAP;
   if (!self->obj_id && drag->start_valid)
     {
       guint qtick = bst_event_roll_controller_quantize (self, drag->start_tick);
@@ -537,13 +537,13 @@ insert_start (BstEventRollController *self,
         {
           self->obj_tick = qtick;
           self->obj_value = drag->current_value;
-          error = Bse::ERROR_NONE;
+          error = Bse::Error::NONE;
         }
       else
-        error = Bse::ERROR_NO_TARGET;
+        error = Bse::Error::NO_TARGET;
     }
   else if (!self->obj_id)
-    error = Bse::ERROR_NO_TARGET;
+    error = Bse::Error::NO_TARGET;
   else /* no insertion */
     self->obj_id = 0;
   bst_status_eprintf (error, _("Insert Control Event"));
@@ -586,7 +586,7 @@ resize_motion (BstEventRollController *self,
     {
       bse_item_group_undo (part.proxy_id(), "Resize Control Event");
       self->obj_value = drag->current_value;
-      if (part.change_control (self->obj_id, self->obj_tick, CONTROL_TYPE (self), self->obj_value) != 
Bse::ERROR_NONE)
+      if (part.change_control (self->obj_id, self->obj_tick, CONTROL_TYPE (self), self->obj_value) != 
Bse::Error::NONE)
         drag->state = GXK_DRAG_ERROR;
       bse_item_ungroup_undo (part.proxy_id());
     }
diff --git a/beast-gtk/bstfiledialog.cc b/beast-gtk/bstfiledialog.cc
index 019e766..5f59162 100644
--- a/beast-gtk/bstfiledialog.cc
+++ b/beast-gtk/bstfiledialog.cc
@@ -489,7 +489,7 @@ store_bse_file (Bse::ProjectH project, SfiProxy super, const gchar *file_name, c
   gboolean handled = TRUE;
   gchar *msg = NULL;
   /* handle file exists cases */
-  if (error == Bse::ERROR_FILE_EXISTS)
+  if (error == Bse::Error::FILE_EXISTS)
     {
       if (!want_overwrite)
         {
@@ -507,7 +507,7 @@ store_bse_file (Bse::ProjectH project, SfiProxy super, const gchar *file_name, c
         {
           /* save to temporary file */
           gchar *temp_file = NULL;
-          while (error == Bse::ERROR_FILE_EXISTS)
+          while (error == Bse::Error::FILE_EXISTS)
             {
               g_free (temp_file);
               temp_file = g_strdup_format ("%s.tmp%06xyXXXXXX", file_name, rand() & 0xfffffd);
@@ -516,9 +516,9 @@ store_bse_file (Bse::ProjectH project, SfiProxy super, const gchar *file_name, c
               error = bse_project_store_bse (project.proxy_id(), super, temp_file, self_contained);
             }
           /* replace file by temporary file */
-          if (error != Bse::ERROR_NONE)
+          if (error != Bse::Error::NONE)
             {
-              unlink (temp_file); /* error != Bse::ERROR_FILE_EXISTS */
+              unlink (temp_file); /* error != Bse::Error::FILE_EXISTS */
               msg = g_strdup_format (_("Failed to save to file\n`%s'\ndue to:\n%s"), file_name, 
Bse::error_blurb (error));
             }
           else if (rename (temp_file, file_name) < 0)
@@ -532,7 +532,7 @@ store_bse_file (Bse::ProjectH project, SfiProxy super, const gchar *file_name, c
       else
         handled = FALSE;        /* exists && !overwrite */
     }
-  else if (error != Bse::ERROR_NONE)
+  else if (error != Bse::Error::NONE)
     msg = g_strdup_format (_("Failed to save to file\n`%s'\ndue to:\n%s"), file_name, Bse::error_blurb 
(error));
   /* report errors */
   if (msg)
@@ -547,7 +547,7 @@ store_bse_file (Bse::ProjectH project, SfiProxy super, const gchar *file_name, c
       handled = FALSE;
     }
   else if (handled) /* no error */
-    bst_status_eprintf (Bse::ERROR_NONE, "%s", title);
+    bst_status_eprintf (Bse::Error::NONE, "%s", title);
   g_free (title);
   return handled;
 }
diff --git a/beast-gtk/bstgconfig.cc b/beast-gtk/bstgconfig.cc
index 0cb7a64..3494fc1 100644
--- a/beast-gtk/bstgconfig.cc
+++ b/beast-gtk/bstgconfig.cc
@@ -142,7 +142,7 @@ bst_rc_dump (const gchar *file_name)
   SfiRec *rec;
   gint fd;
 
-  assert_return (file_name != NULL, Bse::ERROR_INTERNAL);
+  assert_return (file_name != NULL, Bse::Error::INTERNAL);
 
   sfi_make_dirname_path (file_name);
   fd = open (file_name,
@@ -150,7 +150,7 @@ bst_rc_dump (const gchar *file_name)
             0666);
 
   if (fd < 0)
-    return errno == EEXIST ? Bse::ERROR_FILE_EXISTS : Bse::ERROR_IO;
+    return errno == EEXIST ? Bse::Error::FILE_EXISTS : Bse::Error::IO;
 
   wstore = sfi_wstore_new ();
 
@@ -178,7 +178,7 @@ bst_rc_dump (const gchar *file_name)
   sfi_wstore_flush_fd (wstore, fd);
   sfi_wstore_destroy (wstore);
 
-  return close (fd) < 0 ? Bse::ERROR_IO : Bse::ERROR_NONE;
+  return close (fd) < 0 ? Bse::Error::IO : Bse::Error::NONE;
 }
 
 static GTokenType
@@ -218,20 +218,20 @@ Bse::ErrorType
 bst_rc_parse (const gchar *file_name)
 {
   SfiRStore *rstore;
-  Bse::ErrorType error = Bse::ERROR_NONE;
+  Bse::ErrorType error = Bse::Error::NONE;
   gint fd;
 
-  assert_return (file_name != NULL, Bse::ERROR_INTERNAL);
+  assert_return (file_name != NULL, Bse::Error::INTERNAL);
 
   fd = open (file_name, O_RDONLY, 0);
   if (fd < 0)
     return (errno == ENOENT || errno == ENOTDIR || errno == ELOOP ?
-           Bse::ERROR_FILE_NOT_FOUND : Bse::ERROR_IO);
+           Bse::Error::FILE_NOT_FOUND : Bse::Error::IO);
 
   rstore = sfi_rstore_new ();
   sfi_rstore_input_fd (rstore, fd, file_name);
   if (sfi_rstore_parse_all (rstore, NULL, rc_file_try_statement, NULL) > 0)
-    error = Bse::ERROR_PARSE_ERROR;
+    error = Bse::Error::PARSE_ERROR;
   sfi_rstore_destroy (rstore);
   close (fd);
   return error;
diff --git a/beast-gtk/bstkeybindings.cc b/beast-gtk/bstkeybindings.cc
index e026187..5b119e5 100644
--- a/beast-gtk/bstkeybindings.cc
+++ b/beast-gtk/bstkeybindings.cc
@@ -601,14 +601,14 @@ bst_key_binding_dump (const gchar *file_name,
   GSList *slist;
   gint fd;
 
-  assert_return (file_name != NULL, Bse::ERROR_INTERNAL);
+  assert_return (file_name != NULL, Bse::Error::INTERNAL);
 
   sfi_make_dirname_path (file_name);
   fd = open (file_name,
              O_WRONLY | O_CREAT | O_TRUNC, /* O_EXCL, */
              0666);
   if (fd < 0)
-    return errno == EEXIST ? Bse::ERROR_FILE_EXISTS : Bse::ERROR_IO;
+    return errno == EEXIST ? Bse::Error::FILE_EXISTS : Bse::Error::IO;
 
   wstore = sfi_wstore_new ();
 
@@ -635,7 +635,7 @@ bst_key_binding_dump (const gchar *file_name,
   sfi_wstore_flush_fd (wstore, fd);
   sfi_wstore_destroy (wstore);
 
-  return close (fd) < 0 ? Bse::ERROR_IO : Bse::ERROR_NONE;
+  return close (fd) < 0 ? Bse::Error::IO : Bse::Error::NONE;
 }
 
 static GTokenType
@@ -676,11 +676,11 @@ Bse::ErrorType
 bst_key_binding_parse (const gchar *file_name,
                        GSList      *kbindings)
 {
-  Bse::ErrorType error = Bse::ERROR_NONE;
+  Bse::ErrorType error = Bse::Error::NONE;
   SfiRStore *rstore;
   gchar *absname;
   gint fd;
-  assert_return (file_name != NULL, Bse::ERROR_INTERNAL);
+  assert_return (file_name != NULL, Bse::Error::INTERNAL);
 
   absname = sfi_path_get_filename (file_name, NULL);
   fd = open (absname, O_RDONLY, 0);
@@ -688,13 +688,13 @@ bst_key_binding_parse (const gchar *file_name,
     {
       g_free (absname);
       return (errno == ENOENT || errno == ENOTDIR || errno == ELOOP ?
-              Bse::ERROR_FILE_NOT_FOUND : Bse::ERROR_IO);
+              Bse::Error::FILE_NOT_FOUND : Bse::Error::IO);
     }
 
   rstore = sfi_rstore_new ();
   sfi_rstore_input_fd (rstore, fd, absname);
   if (sfi_rstore_parse_all (rstore, kbindings, key_binding_try_statement, absname) > 0)
-    error = Bse::ERROR_PARSE_ERROR;
+    error = Bse::Error::PARSE_ERROR;
   sfi_rstore_destroy (rstore);
   close (fd);
   g_free (absname);
diff --git a/beast-gtk/bstmain.cc b/beast-gtk/bstmain.cc
index 6a9d111..4655e01 100644
--- a/beast-gtk/bstmain.cc
+++ b/beast-gtk/bstmain.cc
@@ -418,9 +418,9 @@ main_open_files (int filesc, char **filesv)
                 exit (3);
               exit (0);
             }
-          if (!error || error == Bse::ERROR_FILE_NOT_FOUND)
+          if (!error || error == Bse::Error::FILE_NOT_FOUND)
             {
-              error = Bse::ERROR_NONE;
+              error = Bse::Error::NONE;
               app = bst_app_new (project);
               gxk_idle_show_widget (GTK_WIDGET (app));
               gtk_widget_hide (beast_splash);
diff --git a/beast-gtk/bstmsgabsorb.cc b/beast-gtk/bstmsgabsorb.cc
index 50d870c..866d717 100644
--- a/beast-gtk/bstmsgabsorb.cc
+++ b/beast-gtk/bstmsgabsorb.cc
@@ -233,14 +233,14 @@ bst_msg_absorb_config_box_get (GtkWidget *self)
 static Bse::ErrorType
 bst_msg_absorb_config_dump (const gchar *file_name)
 {
-  assert_return (file_name != NULL, Bse::ERROR_INTERNAL);
+  assert_return (file_name != NULL, Bse::Error::INTERNAL);
 
   sfi_make_dirname_path (file_name);
   gint fd = open (file_name,
                   O_WRONLY | O_CREAT | O_TRUNC, /* O_EXCL, */
                   0666);
   if (fd < 0)
-    return errno == EEXIST ? Bse::ERROR_FILE_EXISTS : Bse::ERROR_IO;
+    return errno == EEXIST ? Bse::Error::FILE_EXISTS : Bse::Error::IO;
 
   SfiWStore *wstore = sfi_wstore_new ();
 
@@ -259,7 +259,7 @@ bst_msg_absorb_config_dump (const gchar *file_name)
   sfi_wstore_flush_fd (wstore, fd);
   sfi_wstore_destroy (wstore);
 
-  return close (fd) < 0 ? Bse::ERROR_IO : Bse::ERROR_NONE;
+  return close (fd) < 0 ? Bse::Error::IO : Bse::Error::NONE;
 }
 
 void
@@ -297,7 +297,7 @@ msg_absorb_config_try_statement (gpointer   context_data,
 static Bse::ErrorType
 bst_msg_absorb_config_parse (const gchar *file_name)
 {
-  assert_return (file_name != NULL, Bse::ERROR_INTERNAL);
+  assert_return (file_name != NULL, Bse::Error::INTERNAL);
 
   gchar *absname = sfi_path_get_filename (file_name, NULL);
   gint fd = open (absname, O_RDONLY, 0);
@@ -305,14 +305,14 @@ bst_msg_absorb_config_parse (const gchar *file_name)
     {
       g_free (absname);
       return (errno == ENOENT || errno == ENOTDIR || errno == ELOOP ?
-              Bse::ERROR_FILE_NOT_FOUND : Bse::ERROR_IO);
+              Bse::Error::FILE_NOT_FOUND : Bse::Error::IO);
     }
 
   SfiRStore *rstore = sfi_rstore_new ();
   sfi_rstore_input_fd (rstore, fd, absname);
-  Bse::ErrorType error = Bse::ERROR_NONE;
+  Bse::ErrorType error = Bse::Error::NONE;
   if (sfi_rstore_parse_all (rstore, NULL, msg_absorb_config_try_statement, absname) > 0)
-    error = Bse::ERROR_PARSE_ERROR;
+    error = Bse::Error::PARSE_ERROR;
   sfi_rstore_destroy (rstore);
   close (fd);
   g_free (absname);
diff --git a/beast-gtk/bstpianorollctrl.cc b/beast-gtk/bstpianorollctrl.cc
index 4161087..09f942a 100644
--- a/beast-gtk/bstpianorollctrl.cc
+++ b/beast-gtk/bstpianorollctrl.cc
@@ -592,7 +592,7 @@ move_motion (BstPianoRollController *self,
                       self->obj_tick, note_changed ? 0 : self->obj_duration))
     {
       bse_item_group_undo (part.proxy_id(), "Move Note");
-      if (part.delete_event (self->obj_id) != Bse::ERROR_NONE)
+      if (part.delete_event (self->obj_id) != Bse::Error::NONE)
         drag->state = GXK_DRAG_ERROR;
       else
        {
@@ -706,17 +706,17 @@ insert_start (BstPianoRollController *self,
              BstPianoRollDrag       *drag)
 {
   Bse::PartH part = self->proll->part;
-  Bse::ErrorType error = Bse::ERROR_NO_TARGET;
+  Bse::ErrorType error = Bse::Error::NO_TARGET;
   if (drag->start_valid)
     {
       guint qtick = bst_piano_roll_controller_quantize (self, drag->start_tick);
       guint duration = drag->proll->ppqn * 4 / NOTE_LENGTH (self);
       if (check_hoverlap (part, qtick, duration, drag->start_note, 0, 0))
-       error = Bse::ERROR_INVALID_OVERLAP;
+       error = Bse::Error::INVALID_OVERLAP;
       else
        {
          part.insert_note_auto (qtick, duration, drag->start_note, 0, 1.0);
-         error = Bse::ERROR_NONE;
+         error = Bse::Error::NONE;
        }
     }
   bst_status_eprintf (error, _("Insert Note"));
@@ -912,7 +912,7 @@ controller_piano_drag (BstPianoRollController *self,
          project.auto_deactivate (5 * 1000);
          error = project.activate();
          self->obj_note = drag->current_note;
-         if (error == Bse::ERROR_NONE)
+         if (error == Bse::Error::NONE)
            bse_song_synthesize_note (song, track, 384 * 4, self->obj_note, 0, 1.0);
          bst_status_eprintf (error, _("Play note"));
          drag->state = GXK_DRAG_CONTINUE;
diff --git a/beast-gtk/bstpreferences.cc b/beast-gtk/bstpreferences.cc
index feb7af6..dcda74d 100644
--- a/beast-gtk/bstpreferences.cc
+++ b/beast-gtk/bstpreferences.cc
@@ -288,7 +288,7 @@ bst_preferences_load_rc_files (void)
   slist = g_slist_append (slist, bst_pattern_controller_piano_keys());
   // slist = g_slist_append (slist, bst_pattern_controller_generic_keys());
   error = bst_key_binding_parse (bst_key_binding_rcfile (), slist);
-  if (error == Bse::ERROR_FILE_NOT_FOUND)
+  if (error == Bse::Error::FILE_NOT_FOUND)
     {
       /* try loading fallback table */
       gchar *file = g_strconcat (Bse::installpath (Bse::INSTALLPATH_DATADIR_KEYS).c_str(), 
G_DIR_SEPARATOR_S, "keyrc.us", NULL);
@@ -309,7 +309,7 @@ bst_preferences_saved (void)
 void
 bst_preferences_save (BstPreferences *self)
 {
-  Bse::ErrorType error = Bse::ERROR_NONE;
+  Bse::ErrorType error = Bse::Error::NONE;
   gchar *file_name;
   GSList *slist = NULL;
 
diff --git a/beast-gtk/bstprocedure.cc b/beast-gtk/bstprocedure.cc
index 08c05eb..235df06 100644
--- a/beast-gtk/bstprocedure.cc
+++ b/beast-gtk/bstprocedure.cc
@@ -261,7 +261,7 @@ bst_procedure_shell_execute (BstProcedureShell *self)
   if (widget)
     {
       SfiGlueProc *proc = self->proc;
-      Bse::ErrorType error = Bse::ERROR_NONE;
+      Bse::ErrorType error = Bse::Error::NONE;
       SfiSeq *pseq = sfi_seq_new ();
       GValue *rvalue;
       guint i;
diff --git a/beast-gtk/bstskinconfig.cc b/beast-gtk/bstskinconfig.cc
index 0cb32e5..9e4fb9a 100644
--- a/beast-gtk/bstskinconfig.cc
+++ b/beast-gtk/bstskinconfig.cc
@@ -194,7 +194,7 @@ bst_skin_dump (const gchar *file_name)
   SfiRec *rec;
   gint fd;
 
-  assert_return (file_name != NULL, Bse::ERROR_INTERNAL);
+  assert_return (file_name != NULL, Bse::Error::INTERNAL);
 
   sfi_make_dirname_path (file_name);
   fd = open (file_name,
@@ -202,7 +202,7 @@ bst_skin_dump (const gchar *file_name)
              0666);
 
   if (fd < 0)
-    return errno == EEXIST ? Bse::ERROR_FILE_EXISTS : Bse::ERROR_IO;
+    return errno == EEXIST ? Bse::Error::FILE_EXISTS : Bse::Error::IO;
 
   wstore = sfi_wstore_new ();
 
@@ -228,7 +228,7 @@ bst_skin_dump (const gchar *file_name)
   sfi_wstore_flush_fd (wstore, fd);
   sfi_wstore_destroy (wstore);
 
-  return close (fd) < 0 ? Bse::ERROR_IO : Bse::ERROR_NONE;
+  return close (fd) < 0 ? Bse::Error::IO : Bse::Error::NONE;
 }
 
 static GTokenType
@@ -260,11 +260,11 @@ Bse::ErrorType
 bst_skin_parse (const gchar *file_name)
 {
   SfiRStore *rstore;
-  Bse::ErrorType error = Bse::ERROR_NONE;
+  Bse::ErrorType error = Bse::Error::NONE;
   gchar *absname;
   gint fd;
 
-  assert_return (file_name != NULL, Bse::ERROR_INTERNAL);
+  assert_return (file_name != NULL, Bse::Error::INTERNAL);
 
   absname = sfi_path_get_filename (file_name, NULL);
   fd = open (absname, O_RDONLY, 0);
@@ -272,13 +272,13 @@ bst_skin_parse (const gchar *file_name)
     {
       g_free (absname);
       return (errno == ENOENT || errno == ENOTDIR || errno == ELOOP ?
-              Bse::ERROR_FILE_NOT_FOUND : Bse::ERROR_IO);
+              Bse::Error::FILE_NOT_FOUND : Bse::Error::IO);
     }
 
   rstore = sfi_rstore_new ();
   sfi_rstore_input_fd (rstore, fd, absname);
   if (sfi_rstore_parse_all (rstore, NULL, skin_file_try_statement, absname) > 0)
-    error = Bse::ERROR_PARSE_ERROR;
+    error = Bse::Error::PARSE_ERROR;
   sfi_rstore_destroy (rstore);
   close (fd);
   g_free (absname);
diff --git a/beast-gtk/bstsnetrouter.cc b/beast-gtk/bstsnetrouter.cc
index fed7b48..19fa5d8 100644
--- a/beast-gtk/bstsnetrouter.cc
+++ b/beast-gtk/bstsnetrouter.cc
@@ -625,7 +625,7 @@ bst_snet_router_root_event (BstSNetRouter   *self,
             {
               Bse::ErrorType error;
               if (!csource || (self->drag_is_input ? ochannel : ichannel) == ~uint (0))
-                error = self->drag_is_input ? Bse::ERROR_SOURCE_NO_SUCH_OCHANNEL : 
Bse::ERROR_SOURCE_NO_SUCH_ICHANNEL;
+                error = self->drag_is_input ? Bse::Error::SOURCE_NO_SUCH_OCHANNEL : 
Bse::Error::SOURCE_NO_SUCH_ICHANNEL;
               else if (self->drag_is_input)
                 error = bse_source_set_input_by_id (self->drag_csource->source, self->drag_channel,
                                                     csource->source, ochannel);
diff --git a/beast-gtk/bsttreestores.cc b/beast-gtk/bsttreestores.cc
index 12c7ebc..dcbef80 100644
--- a/beast-gtk/bsttreestores.cc
+++ b/beast-gtk/bsttreestores.cc
@@ -69,7 +69,7 @@ file_store_idle_handler (gpointer data)
                           -1);
       Bse::SampleFileInfo info = bse_server.sample_file_info (filename);
       const gchar *dsep = strrchr (filename, G_DIR_SEPARATOR);
-      if (info.error == Bse::ERROR_FILE_IS_DIR)
+      if (info.error == Bse::Error::FILE_IS_DIR)
         {
           loader = "Directory";
           name = dsep ? dsep + 1 : filename;    /* fallback wave name */
@@ -79,7 +79,7 @@ file_store_idle_handler (gpointer data)
           name = dsep ? dsep + 1 : filename;    /* fallback wave name */
           loader = info.error ? Bse::error_blurb (info.error) : info.loader;
           guint l = strlen (filename);
-          if (info.error == Bse::ERROR_FORMAT_UNKNOWN &&
+          if (info.error == Bse::Error::FORMAT_UNKNOWN &&
               l >= 4 && strcasecmp (filename + l - 4, ".bse") == 0)
             {
               nstr = bst_file_scan_find_key (filename, "container-child", NULL);
diff --git a/beast-gtk/bstwaveeditor.cc b/beast-gtk/bstwaveeditor.cc
index f2be102..a5e1184 100644
--- a/beast-gtk/bstwaveeditor.cc
+++ b/beast-gtk/bstwaveeditor.cc
@@ -532,7 +532,7 @@ bst_wave_editor_set_esample (BstWaveEditor *self,
          Bse::ErrorType error;
          bse_item_use (self->esample);
          error = bse_editable_sample_open (self->esample);
-         self->esample_open = error == Bse::ERROR_NONE;
+         self->esample_open = error == Bse::Error::NONE;
          if (error)
            g_message ("failed to open sample: %s", Bse::error_blurb (error));
        }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]