[beast: 10/20] BSE: remove obsolete scripting interface

[Tim Janik <timj src gnome org>]

commit 896e13fd59028def310f4b0ccda8e4c39e3b00fb
Author: Tim Janik <timj gnu org>
Date:   Sun Jun 18 22:48:25 2017 +0200

    BSE: remove obsolete scripting interface
    
    Signed-off-by: Tim Janik <timj gnu org>

 beast-gtk/bstusermessage.cc |    4 +-
 bse/Makefile.am             |    4 +-
 bse/bsejanitor.cc           |    7 +-
 bse/bsejanitor.proc         |  237 ----------------------------
 bse/bsescripthelper.cc      |  368 -------------------------------------------
 bse/bsescripthelper.hh      |   41 -----
 bse/bseserver.cc            |   12 --
 7 files changed, 5 insertions(+), 668 deletions(-)
---
diff --git a/beast-gtk/bstusermessage.cc b/beast-gtk/bstusermessage.cc
index e4bd84a..5559c67 100644
--- a/beast-gtk/bstusermessage.cc
+++ b/beast-gtk/bstusermessage.cc
@@ -588,7 +588,7 @@ janitor_window_deleted (GxkDialog *dialog)
                        "any_signal", janitor_progress, dialog,
                        "any_signal", janitor_unconnected, dialog,
                        NULL);
-  bse_janitor_kill (janitor);
+  // bse_janitor_kill (janitor);
   bse_item_unuse (janitor);
 }
 
@@ -662,7 +662,7 @@ bst_message_dialog_display (const char     *log_domain,
   msg.type = mtype;
   msg.ident = bst_msg_type_ident (mtype);
   msg.label = bst_msg_type_ident (mtype);
-  msg.janitor = bse_script_janitor();
+  // msg.janitor = bse_script_janitor();
   msg.process = g_strdup (Rapicorn::ThisThread::name().c_str());
   msg.pid = Rapicorn::ThisThread::thread_pid();
   msg.n_msg_bits = 0;
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 4704159..26b6ba6 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -38,7 +38,7 @@ bse_public_headers = $(strip \
        bsemidireceiver.hh      bsemidisynth.hh         bseobject.hh                    bsepart.hh \
        bsepcminput.hh          bsepcmoutput.hh         bseparam.hh                     \
        bsepcmdevice.hh         bsepcmdevice-oss.hh     bsepcmdevice-null.hh            bseplugin.hh \
-       bseprocedure.hh         bseproject.hh           bsescripthelper.hh              bseserver.hh \
+       bseprocedure.hh         bseproject.hh                                           bseserver.hh \
        bsesnet.hh              bsesnooper.hh           bsesong.hh                      bsesequencer.hh \
        bsesource.hh            bsestandardosc.hh       bsestandardsynths.hh            bsestorage.hh \
        bseinstrumentoutput.hh  bsesubiport.hh          bseinstrumentinput.hh           bsesuboport.hh \
@@ -73,7 +73,7 @@ bse_sources = $(strip \
        bsemidireceiver.cc      bsemidisynth.cc         bseobject.cc                    bsepart.cc \
        bsepcminput.cc          bsepcmoutput.cc         bseparam.cc                     \
        bsepcmdevice.cc         bsepcmdevice-oss.cc     bsepcmdevice-null.cc            bseplugin.cc \
-       bseprocedure.cc         bseproject.cc           bsescripthelper.cc              bseserver.cc \
+       bseprocedure.cc         bseproject.cc                                           bseserver.cc \
        bsesnet.cc              bsesnooper.cc           bsesong.cc                      bsesequencer.cc \
        bsesoundfontrepo.cc     bsesoundfont.cc         bsesoundfontpreset.cc           bsesoundfontosc.cc \
        bsesource.cc            bsestandardosc.cc       bsestandardsynths.cc            bsestorage.cc \
diff --git a/bse/bsejanitor.cc b/bse/bsejanitor.cc
index f7eda9f..70f329c 100644
--- a/bse/bsejanitor.cc
+++ b/bse/bsejanitor.cc
@@ -5,7 +5,6 @@
 #include "bseserver.hh"
 #include "bsecontainer.hh"
 #include "bseprocedure.hh"
-#include "bsescripthelper.hh"
 
 
 enum
@@ -407,11 +406,7 @@ janitor_client_msg (SfiGlueDecoder *decoder,
                    const char     *message,
                    const GValue   *value)
 {
-  BseJanitor *self = BSE_JANITOR (user_data);
-  GValue *rvalue;
-  rvalue = bse_script_check_client_msg (decoder, self, message, value);
-  if (rvalue)
-    return rvalue;
+  // this used to call bse_script_check_client_msg
   return NULL;
 }
 
diff --git a/bse/bsejanitor.proc b/bse/bsejanitor.proc
index 6bf473e..8a5cdb9 100644
--- a/bse/bsejanitor.proc
+++ b/bse/bsejanitor.proc
@@ -192,240 +192,3 @@ BODY (BseProcedureClass *proc,
   sfi_value_set_string (out_values++, a ? a->blurb : NULL);
   return Bse::Error::NONE;
 }
-
-METHOD (BseJanitor, kill) {
-  HELP = "Kill a currently running janitor.";
-  IN   = bse_param_spec_object ("janitor", "Janitor", NULL,
-                                BSE_TYPE_JANITOR, SFI_PARAM_STANDARD);
-}
-BODY (BseProcedureClass *proc,
-      const GValue      *in_values,
-      GValue            *out_values)
-{
-  /* extract parameter values */
-  BseJanitor *self = (BseJanitor*) bse_value_get_object (in_values++);
-
-  /* check parameters */
-  if (!BSE_IS_JANITOR (self))
-    return Bse::Error::PROC_PARAM_INVAL;
-
-  /* action */
-  bse_janitor_kill (self);
-
-  return Bse::Error::NONE;
-}
-
-PROCEDURE (bse-script-janitor, "Script/Get Janitor") {
-  HELP  = "Retrieve the connection dependant janitor object.";
-  OUT   = bse_param_spec_object ("janitor", "Janitor", NULL,
-                                BSE_TYPE_JANITOR, SFI_PARAM_STANDARD);
-}
-BODY (BseProcedureClass *proc,
-      const GValue      *in_values,
-      GValue            *out_values)
-{
-  BseJanitor *self = bse_janitor_get_current ();
-
-  /* check execution context */
-  if (!self || !self->port || self->port_closed)
-    return Bse::Error::PROC_EXECUTION;
-
-  /* set output parameters */
-  bse_value_set_object (out_values++, self);
-
-  return Bse::Error::NONE;
-}
-
-PROCEDURE (bse-script-add-action, "Script/Add Action") {
-  HELP = "Install a user action for script control.";
-  IN   = sfi_pspec_string ("action", "Action", NULL,
-                           NULL, SFI_PARAM_STANDARD);
-  IN   = sfi_pspec_string ("name", "Name", NULL,
-                           NULL, SFI_PARAM_STANDARD);
-  IN   = sfi_pspec_string ("blurb", "Blurb", NULL,
-                           NULL, SFI_PARAM_STANDARD);
-}
-BODY (BseProcedureClass *proc,
-      const GValue      *in_values,
-      GValue            *out_values)
-{
-  /* extract parameter values */
-  BseJanitor  *self   = bse_janitor_get_current ();
-  const gchar *action = sfi_value_get_string (in_values++);
-  const gchar *name   = sfi_value_get_string (in_values++);
-  const gchar *blurb  = sfi_value_get_string (in_values++);
-
-  /* check parameters */
-  if (!BSE_IS_JANITOR (self) || !action || !name)
-    return Bse::Error::PROC_PARAM_INVAL;
-
-  /* check execution context */
-  if (!self->port || self->port_closed)
-    return Bse::Error::PROC_EXECUTION;
-
-  /* action */
-  bse_janitor_add_action (self, action, name, blurb);
-
-  return Bse::Error::NONE;
-}
-
-PROCEDURE (bse-script-remove-action, "Script/Remove Action") {
-  HELP = "Remove a previously installed user action from script control.";
-  IN   = sfi_pspec_string ("action", "Action", NULL,
-                           NULL, SFI_PARAM_STANDARD);
-}
-BODY (BseProcedureClass *proc,
-      const GValue      *in_values,
-      GValue            *out_values)
-{
-  /* extract parameter values */
-  BseJanitor  *self   = bse_janitor_get_current ();
-  const gchar *action = sfi_value_get_string (in_values++);
-
-  /* check parameters */
-  if (!BSE_IS_JANITOR (self) || !action)
-    return Bse::Error::PROC_PARAM_INVAL;
-
-  /* check execution context */
-  if (!self->port || self->port_closed)
-    return Bse::Error::PROC_EXECUTION;
-
-  /* action */
-  bse_janitor_remove_action (self, action);
-
-  return Bse::Error::NONE;
-}
-
-PROCEDURE (bse-script-set-status, "Script/Set Status") {
-  HELP  = "Alter script status message.";
-  IN    = sfi_pspec_string ("message", "Message", NULL,
-                           NULL, SFI_PARAM_STANDARD);
-} BODY (BseProcedureClass *proc,
-       const GValue      *in_values,
-       GValue            *out_values)
-{
-  /* extract parameter values */
-  BseJanitor    *self    = bse_janitor_get_current ();
-  const gchar   *message = sfi_value_get_string (in_values++);
-
-  /* check parameters */
-  if (!BSE_IS_JANITOR (self))
-    return Bse::Error::PROC_PARAM_INVAL;
-
-  /* check execution context */
-  if (!self->port || self->port_closed)
-    return Bse::Error::PROC_EXECUTION;
-  if (!message)
-    message = "";
-
-  /* action */
-  bse_item_set (self, "status-message", message, NULL);
-
-  return Bse::Error::NONE;
-}
-
-PROCEDURE (bse-script-progress, "Script/Progress") {
-  HELP  = "Indicate progress (from 0.0 to 1.0 or -1 for unknown amount).";
-  IN    = sfi_pspec_real ("progress", "Progress", NULL,
-                         -1, -1, 1.0, 0.1,
-                         SFI_PARAM_STANDARD);
-} BODY (BseProcedureClass *proc,
-       const GValue      *in_values,
-       GValue            *out_values)
-{
-  /* extract parameter values */
-  BseJanitor *self = bse_janitor_get_current ();
-  gfloat progress  = sfi_value_get_real (in_values++);
-
-  /* check parameters */
-  if (!BSE_IS_JANITOR (self))
-    return Bse::Error::PROC_PARAM_INVAL;
-
-  /* check execution context */
-  if (!self->port || self->port_closed)
-    return Bse::Error::PROC_EXECUTION;
-
-  /* action */
-  bse_janitor_progress (self, progress);
-
-  return Bse::Error::NONE;
-}
-
-PROCEDURE (bse-script-send-message, "Script/Message") {
-  HELP  = "Send a message from a script.";
-  /* keep arguments in sync with bsescminterp.c */
-  IN    = sfi_pspec_string ("domain", NULL, NULL, NULL, SFI_PARAM_STANDARD);
-  IN    = sfi_pspec_string ("msg-type", NULL, NULL, NULL, SFI_PARAM_STANDARD);
-  IN    = sfi_pspec_string ("title", NULL, NULL, NULL, SFI_PARAM_STANDARD);
-  IN    = sfi_pspec_string ("primary", NULL, NULL, NULL, SFI_PARAM_STANDARD);
-  IN    = sfi_pspec_string ("secondary", NULL, NULL, NULL, SFI_PARAM_STANDARD);
-  IN    = sfi_pspec_string ("details", NULL, NULL, NULL, SFI_PARAM_STANDARD);
-  IN    = sfi_pspec_string ("config-check", NULL, NULL, NULL, SFI_PARAM_STANDARD);
-} BODY (BseProcedureClass *proc,
-        const GValue      *in_values,
-        GValue            *out_values)
-{
-  /* extract parameter values */
-  BseJanitor *janitor = bse_janitor_get_current();
-  if (!BSE_IS_JANITOR (janitor) || !janitor->port || janitor->port_closed)
-    return Bse::Error::PROC_EXECUTION;
-
-  const gchar *domain = sfi_value_get_string (in_values++);
-  const gchar *mtype  = sfi_value_get_string (in_values++);
-  const gchar *text0  = sfi_value_get_string (in_values++);
-  const gchar *text1  = sfi_value_get_string (in_values++);
-  const gchar *text2  = sfi_value_get_string (in_values++);
-  const gchar *text3  = sfi_value_get_string (in_values++);
-  const gchar *check  = sfi_value_get_string (in_values++);
-
-  auto stupid_convert = [] (char c) {
-    switch (c)
-      {
-      case 'E': case 'e':       return Bse::UserMessageType::ERROR;
-      case 'W': case 'w':       return Bse::UserMessageType::WARNING;
-      default:
-      case 'I': case 'i':       return Bse::UserMessageType::INFO;
-      case 'D': case 'd':       return Bse::UserMessageType::DEBUG;
-      }
-  };
-
-  if (text1)
-    {
-      using namespace Bse;
-      UserMessage umsg;
-      umsg.utype = stupid_convert (mtype ? mtype[0] : 0);
-      umsg.title = text0 ? text0 : "WARNING";
-      umsg.text1 = text1;
-      if (text2)
-        umsg.text2 = text2;
-      if (text3)
-        umsg.text3 = text3;
-      if (check && check[0])
-        umsg.label = check;
-      ServerImpl::instance().send_user_message (umsg);
-      return Bse::Error::NONE;
-    }
-  else
-    return Bse::Error::PROC_PARAM_INVAL;
-  (void) domain;
-}
-
-PROCEDURE (bse-script-quit, "Script/Quit") {
-  HELP  = "Exit a script succesfully (server side).";
-} BODY (BseProcedureClass *proc,
-       const GValue      *in_values,
-       GValue            *out_values)
-{
-  /* extract parameter values */
-  BseJanitor *janitor = bse_janitor_get_current();
-
-  /* check execution context */
-  if (!BSE_IS_JANITOR (janitor) || !janitor->port || janitor->port_closed)
-    return Bse::Error::PROC_EXECUTION;
-
-  /* action */
-  janitor->force_normal_exit = TRUE;
-  bse_janitor_close (janitor);
-
-  return Bse::Error::NONE;
-}
diff --git a/bse/bseserver.cc b/bse/bseserver.cc
index 66b0519..92b1b91 100644
--- a/bse/bseserver.cc
+++ b/bse/bseserver.cc
@@ -14,7 +14,6 @@
 #include "bsepcmmodule.cc"
 #include "gsldatahandle-mad.hh"
 #include "gslvorbis-enc.hh"
-#include "bsescripthelper.hh"
 #include "bseladspa.hh"
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -1282,17 +1281,6 @@ ServerImpl::load_assets ()
         printerr ("%s: Bse plugin registration failed: %s\n", name, error);
       g_free (name);
     }
-  // load Bse scripts
-  ring = bse_script_path_list_files ();
-  while (ring)
-    {
-      gchar *script = (char*) sfi_ring_pop_head (&ring);
-      BseJanitor *janitor = NULL;
-      Bse::Error error = bse_script_file_register (script, &janitor);
-      if (!janitor)
-        printerr ("%s: Bse script registration failed: %s\n", script, bse_error_blurb (error));
-      g_free (script);
-    }
   // load LADSPA plugins
   ring = bse_ladspa_plugin_path_list_files ();
   while (ring)