[beast/devel: 33/77] BIRNET: remove birnetdebugtools.*

[Tim Janik <timj src gnome org>]

commit c7bbc456d5e2b3841edb0012ff1ed47f5cbcaf0e
Author: Tim Janik <timj gnu org>
Date:   Sun Apr 7 19:10:14 2013 +0200

    BIRNET: remove birnetdebugtools.*

 birnet/Makefile.am         |    2 -
 birnet/birnet.hh           |    1 -
 birnet/birnetdebugtools.cc |   89 --------------------------------------------
 birnet/birnetdebugtools.hh |   29 --------------
 bse/bsemain.cc             |   17 --------
 bse/bsemain.hh             |    6 ---
 sfi/sfiwrapper.cc          |   27 +-------------
 sfi/sfiwrapper.hh          |   10 +----
 8 files changed, 3 insertions(+), 178 deletions(-)
---
diff --git a/birnet/Makefile.am b/birnet/Makefile.am
index dec2c5e..56def6d 100644
--- a/birnet/Makefile.am
+++ b/birnet/Makefile.am
@@ -10,13 +10,11 @@ GLIB_MKENUMS    = glib-mkenums
 birnet_headers = $(strip               \
        birnet.hh                       \
        birnetcdefs.h                   \
-       birnetdebugtools.hh             \
        birnetmsg.hh                    \
        birnettests.h                   \
        birnetutils.hh                  \
 )
 birnet_sources = $(strip               \
-       birnetdebugtools.cc             \
        birnetmsg.cc                    \
        birnetutils.cc                  \
 )
diff --git a/birnet/birnet.hh b/birnet/birnet.hh
index 6447465..be1b907 100644
--- a/birnet/birnet.hh
+++ b/birnet/birnet.hh
@@ -2,7 +2,6 @@
 #ifndef __BIRNET_H__
 #define __BIRNET_H__
 #include <birnet/birnetconfig.h>
-#include <birnet/birnetdebugtools.hh>
 #include <birnet/birnetmsg.hh>
 #include <birnet/birnetutils.hh>
 
diff --git a/bse/bsemain.cc b/bse/bsemain.cc
index 792364f..d3227d6 100644
--- a/bse/bsemain.cc
+++ b/bse/bsemain.cc
@@ -60,7 +60,6 @@ static BseMainArgs       default_main_args = {
   false,                // force_fpu
 };
 BseMainArgs             *bse_main_args = NULL;
-BseTraceArgs             bse_trace_args = { NULL, };
 
 // == BSE Initialization ==
 void
@@ -497,22 +496,6 @@ bse_async_parse_args (gint           *argc_p,
            }
          argv[i] = NULL;
        }
-      else if (strcmp ("--bse-trace-sequencer", argv[i]) == 0 ||
-              strncmp ("--bse-trace-sequencer=", argv[i], 22) == 0)
-       {
-         gchar *equal = argv[i] + 21;
-          const char *arg = NULL;
-         if (*equal == '=')
-            arg = equal + 1;
-         else if (i + 1 < argc)
-           {
-             argv[i++] = NULL;
-             arg = argv[i];
-           }
-          if (!bse_trace_args.sequencer && arg)
-            bse_trace_args.sequencer = sfi_debug_channel_from_file_async (arg);
-         argv[i] = NULL;
-       }
       else if (strcmp ("--bse-latency", argv[i]) == 0 ||
               strncmp ("--bse-latency=", argv[i], 14) == 0)
        {
diff --git a/bse/bsemain.hh b/bse/bsemain.hh
index d4b3dc3..e1e1444 100644
--- a/bse/bsemain.hh
+++ b/bse/bsemain.hh
@@ -64,15 +64,9 @@ typedef struct {
   SfiRing              *midi_drivers;
 } BseMainArgs;
 
-/* --- debuging channels --- */
-typedef struct {
-  SfiDebugChannel       *sequencer;     /* --bse-trace-sequencer */
-} BseTraceArgs;
-
 /* --- internal --- */
 void    _bse_init_c_wrappers    ();
 extern BseMainArgs     *bse_main_args;
-extern BseTraceArgs     bse_trace_args;
 extern GMainContext    *bse_main_context;
 
 G_END_DECLS
diff --git a/sfi/sfiwrapper.cc b/sfi/sfiwrapper.cc
index b7f2bef..b6d8d66 100644
--- a/sfi/sfiwrapper.cc
+++ b/sfi/sfiwrapper.cc
@@ -218,32 +218,7 @@ sfi_msg_display_printf (const char    *log_domain,
   Birnet::Msg::display_parts (log_domain, Birnet::Msg::Type (mtype), parts);
   errno = saved_errno;
 }
-/* --- debug channels --- */
-SfiDebugChannel*
-sfi_debug_channel_from_file_async (const char *file_name)
-{
-  Birnet::DebugChannel *self = Birnet::DebugChannel::new_from_file_async (file_name);
-  ref_sink (self);
-  return (SfiDebugChannel*) self;
-}
-void
-sfi_debug_channel_printf (SfiDebugChannel *debug_channel,
-                          const char      *dummy,
-                          const char      *format,
-                          ...)
-{
-  Birnet::DebugChannel *self = (Birnet::DebugChannel*) debug_channel;
-  va_list a;
-  va_start (a, format);
-  self->printf_valist (format, a);
-  va_end (a);
-}
-void
-sfi_debug_channel_destroy (SfiDebugChannel *debug_channel)
-{
-  Birnet::DebugChannel *self = (Birnet::DebugChannel*) debug_channel;
-  unref (self);
-}
+
 /* --- url handling --- */
 void
 sfi_url_show (const char *url)
diff --git a/sfi/sfiwrapper.hh b/sfi/sfiwrapper.hh
index e52fd3f..f5c1b91 100644
--- a/sfi/sfiwrapper.hh
+++ b/sfi/sfiwrapper.hh
@@ -119,6 +119,7 @@ SfiMsgType      sfi_msg_type_register           (const char     *ident,
 #define         SFI_MSG_SECONDARY                SFI_MSG_TEXT2 /* alias */
 #define         SFI_MSG_DETAIL                   SFI_MSG_TEXT3 /* alias */
 #define         SFI_MSG_TYPE_DEFINE(variable, ident, default_ouput, label) SFI_MSG__TYPEDEF (variable, 
ident, default_ouput, label)
+
 /* --- messaging implementation --- */
 typedef struct SfiMsgPart SfiMsgPart;
 SfiMsgPart*     sfi_msg_part_printf     (uint8          msg_part_id,
@@ -143,14 +144,7 @@ void            sfi_msg_display_printf  (const char    *log_domain,
   static void BIRNET_CONSTRUCTOR \
   BIRNET_CPP_PASTE4 (__sfi_msg_type__init, __LINE__, __, variable) (void) \
   { variable = sfi_msg_type_register (identifier, default_ouput, label); }
-/* --- debug channels --- */
-typedef struct SfiDebugChannel SfiDebugChannel;
-SfiDebugChannel* sfi_debug_channel_from_file_async (const char      *file_name);
-void             sfi_debug_channel_printf          (SfiDebugChannel *debug_channel,
-                                                    const char      *dummy,
-                                                    const char      *format,
-                                                    ...) G_GNUC_PRINTF (3, 4);
-void             sfi_debug_channel_destroy         (SfiDebugChannel *debug_channel);
+
 /* --- url handling --- */
 void sfi_url_show                      (const char           *url);
 void sfi_url_show_with_cookie          (const char           *url,