Changeset 111

Timestamp:

09/03/06 21:19:57 (5 years ago)

Author:

ath

Message:

Restore FmOutputAlsa, delete the old FmOutputOss? and fix some documentation.

Files:

• fm_gui/trunk/AUTHORS (modified) (1 diff)
• fm_gui/trunk/README (modified) (1 diff)
• fm_gui/trunk/data/preferences.glade (added)
• fm_gui/trunk/src/Makefile.am (modified) (1 diff)
• fm_gui/trunk/src/Makefile.in (modified) (1 diff)
• fm_gui/trunk/src/base.c (modified) (4 diffs)
• fm_gui/trunk/src/main.c (modified) (3 diffs)
• fm_server/trunk/AUTHORS (modified) (1 diff)
• fm_server/trunk/libtool (modified) (6 diffs)
• fm_server/trunk/src/Makefile.am (modified) (2 diffs)
• fm_server/trunk/src/Makefile.in (modified) (5 diffs)
• fm_server/trunk/src/fm_effect_rate.c (modified) (1 diff)
• fm_server/trunk/src/fm_output_alsa.c (modified) (14 diffs)
• fm_server/trunk/src/fm_output_alsa.h (modified) (3 diffs)
• fm_server/trunk/src/fm_output_oss.c (deleted)
• fm_server/trunk/src/fm_output_oss.h (deleted)
• fm_server/trunk/src/main.c (modified) (2 diffs)
• fm_server/trunk/test/test_play_file.c (modified) (2 diffs)
• fm_server/trunk/test/test_simple.c (modified) (2 diffs)
• rgc/trunk/AUTHORS (modified) (2 diffs)
• rgc/trunk/intltool-merge (modified) (1 diff)
• rgc/trunk/intltool-update (modified) (1 diff)

fm_gui/trunk/AUTHORS

@@ -1 @@
-Main author and developer:
-        Alberto Botti <ath9@libero.it>
-
-Based on code and ideas from the GDAM "Geoff and Dave's Audio Mixer"
-(www.ffem.org/gdam), the GStreamer multimedia framework (www.gstreamer.net)
-and the terminatorX realtime audio scrathing program by Alexander König
-(www.terminatorX.cx).
+Main author and mantainer:
+        Alberto Botti <alberto.botti@yoda2000.net>

fm_gui/trunk/README

@@ +1 @@
+fm_gui
+
+        a graphical interface for the fm_mixer, part of the FreeMix project
+        http://ciampix.net:8080/proj/wiki/FreeMix

fm_gui/trunk/src/Makefile.am

@@ -12 +12 @@
 
 
-##AM_CFLAGS = $(BINRELOC_CFLAGS)
+AM_CFLAGS = $(BINRELOC_CFLAGS)
 
 AM_LDFLAGS = $(FM_GUI_LIBS)

fm_gui/trunk/src/Makefile.in

@@ -226 +226 @@
 SUBDIRS = tx_widgets
 INCLUDES = $(FM_GUI_CFLAGS)
+AM_CFLAGS = $(BINRELOC_CFLAGS)
 AM_LDFLAGS = $(FM_GUI_LIBS)
 fm_gui_SOURCES = \

fm_gui/trunk/src/base.c

@@ -9 +9 @@
 #include "fm_djmixer_gui.h"
 #include "fm_djmixer.h"
+
+
+extern gchar *global_backend;
+extern gchar *BACKEND_ALSA;
+extern gchar *BACKEND_JACK;
 
 
@@ -48 +53 @@
         g_usleep(100);
         rgc_remote_object_call (bdata->pipeline, "run", NULL);
-        g_usleep(100);
-        rgc_remote_object_call (obj, "connect_to_hw_ports", NULL);
+        if (global_backend == BACKEND_JACK) {
+                g_usleep(100);
+                rgc_remote_object_call (obj, "connect_to_hw_ports", NULL);
+        }
 
         /* check if a mixer already exists */
@@ -67 +74 @@
         /* check if an output already exists */
         /* if not, build one */
-        rgc_remote_object_new_async (base_output_created_cb, data,
-                            "FmOutputJack", "output", NULL);
+        
+        if (global_backend == BACKEND_JACK) 
+                rgc_remote_object_new_async (base_output_created_cb, data,
+                                             "FmOutputJack", "output", NULL);
+        else if (global_backend == BACKEND_ALSA) 
+                rgc_remote_object_new_async (base_output_created_cb, data,
+                                             "FmOutputAlsa", "output", NULL);
+        else
+                g_assert_not_reached ();
 }
 
@@ -79 +93 @@
         rgc_remote_object_new_async (base_pipeline_created_cb, bdata,
                               "FmPipeline", "pipeline", NULL);
+                              
+        return TRUE;
 }

fm_gui/trunk/src/main.c

@@ -8 +8 @@
 
 
+gchar *global_backend;
+gchar *BACKEND_ALSA = "ALSA";
+gchar *BACKEND_JACK = "JACK";
 
 
@@ -28 +31 @@
                 { NULL }
         };
+
+//      global_backend = BACKEND_JACK;
+        global_backend = BACKEND_ALSA;
         
         GOptionContext *context = g_option_context_new ("- a GUI for the fm_server");
@@ -35 +41 @@
 
         global_init ();
-        
 
         /* Initialize a connection. We use RBP (on a TCP socket) here. */

fm_server/trunk/AUTHORS

@@ -1 +1 @@
 Main author and developer:
-        Alberto Botti <ath9@libero.it>
+        Alberto Botti <alberto.botti@yoda2000.net>
 
-Based on code and ideas from the GDAM "Geoff and Dave's Audio Mixer"
-(www.ffem.org/gdam), the GStreamer multimedia framework (www.gstreamer.net)
-and the terminatorX realtime audio scrathing program by Alexander König
-(www.terminatorX.cx).
+Based on code and ideas from:
+* the GDAM "Geoff and Dave's Audio Mixer" (www.ffem.org/gdam)
+* the GStreamer multimedia framework (www.gstreamer.net)
+* the terminatorX realtime audio scrathing program by Alexander König
+  (www.terminatorX.cx)
+* the JACK Audio Connection Kit (www.jackaudio.com) examples and ringbuffer code
+* the ALSA (www.alsa-project.org) programming guide

fm_server/trunk/libtool

@@ -45 +45 @@
 # ### BEGIN LIBTOOL CONFIG
 
-# Libtool was configured on host sarge:
+# Libtool was configured on host crash:
 
 # Shell to use when invoking shell scripts.
@@ -86 +86 @@
 
 # LTCC compiler flags.
-LTCFLAGS="-g -O2"
+LTCFLAGS="-O0 -g -Wall -Werror"
 
 # A language-specific compiler.
@@ -329 +329 @@
 
 # Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/lib/mozilla-firefox /opt/e/lib "
 
 # Fix the shell variable $srcfile for the compiler.
@@ -7224 +7224 @@
 # ### BEGIN LIBTOOL TAG CONFIG: CXX
 
-# Libtool was configured on host sarge:
+# Libtool was configured on host crash:
 
 # Shell to use when invoking shell scripts.
@@ -7265 +7265 @@
 
 # LTCC compiler flags.
-LTCFLAGS="-g -O2"
+LTCFLAGS="-O0 -g -Wall -Werror"
 
 # A language-specific compiler.
@@ -7505 +7505 @@
 
 # Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/lib/mozilla-firefox /opt/e/lib "
 
 # Fix the shell variable $srcfile for the compiler.

fm_server/trunk/src/Makefile.am

@@ -44 +44 @@
         fm_effect_pan.c\
         fm_effect_pan.h
-##      fm_output_oss.c\
-##      fm_output_oss.h\
 
 
@@ -53 +51 @@
 
 
-##if HAVE_ALSA
-##fm_server_SOURCES += fm_output_alsa.c fm_output_alsa.h
-##fm_server_LDADD += -lasound
-##endif
+if HAVE_ALSA
+fm_server_SOURCES += \
+        fm_output_alsa.c \
+        fm_output_alsa.h
+        
+fm_server_LDADD += -lasound
+endif
 
 

fm_server/trunk/src/Makefile.in

@@ -38 +38 @@
 host_triplet = @host@
 bin_PROGRAMS = fm_server$(EXEEXT)
-@HAVE_JACK_TRUE@am__append_1 = \
+@HAVE_ALSA_TRUE@am__append_1 = \
+@HAVE_ALSA_TRUE@        fm_output_alsa.c \
+@HAVE_ALSA_TRUE@        fm_output_alsa.h
+
+@HAVE_ALSA_TRUE@am__append_2 = -lasound
+@HAVE_JACK_TRUE@am__append_3 = \
 @HAVE_JACK_TRUE@        fm_output_jack.c \
 @HAVE_JACK_TRUE@        fm_output_jack.h
@@ -62 +67 @@
         fm_effect_gain.h fm_effect_rate.c fm_effect_rate.h fm_mixer.c \
         fm_mixer.h fm_djmixer.c fm_djmixer.h fm_buffer.c fm_buffer.h \
-        fm_effect_pan.c fm_effect_pan.h fm_output_jack.c \
-        fm_output_jack.h
-@HAVE_JACK_TRUE@am__objects_1 = fm_output_jack.$(OBJEXT)
+        fm_effect_pan.c fm_effect_pan.h fm_output_alsa.c \
+        fm_output_alsa.h fm_output_jack.c fm_output_jack.h
+@HAVE_ALSA_TRUE@am__objects_1 = fm_output_alsa.$(OBJEXT)
+@HAVE_JACK_TRUE@am__objects_2 = fm_output_jack.$(OBJEXT)
 am_fm_server_OBJECTS = main.$(OBJEXT) fm_utils.$(OBJEXT) \
         fm_input.$(OBJEXT) fm_output.$(OBJEXT) fm_effect.$(OBJEXT) \
@@ -72 +78 @@
         fm_effect_rate.$(OBJEXT) fm_mixer.$(OBJEXT) \
         fm_djmixer.$(OBJEXT) fm_buffer.$(OBJEXT) \
-        fm_effect_pan.$(OBJEXT) $(am__objects_1)
+        fm_effect_pan.$(OBJEXT) $(am__objects_1) $(am__objects_2)
 fm_server_OBJECTS = $(am_fm_server_OBJECTS)
 am__DEPENDENCIES_1 =
 fm_server_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-        fm_input_gst/libfm_input_gst.la
+        fm_input_gst/libfm_input_gst.la $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -258 +264 @@
         fm_effect_rate.c fm_effect_rate.h fm_mixer.c fm_mixer.h \
         fm_djmixer.c fm_djmixer.h fm_buffer.c fm_buffer.h \
-        fm_effect_pan.c fm_effect_pan.h $(am__append_1)
-fm_server_LDADD = \
-        $(FM_SERVER_LIBS) \
-        fm_input_gst/libfm_input_gst.la
-
+        fm_effect_pan.c fm_effect_pan.h $(am__append_1) \
+        $(am__append_3)
+fm_server_LDADD = $(FM_SERVER_LIBS) fm_input_gst/libfm_input_gst.la \
+        $(am__append_2)
 all: all-recursive
 
@@ -347 +352 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_mixer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_output.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_output_alsa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_output_jack.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_pipeline.Po@am__quote@

fm_server/trunk/src/fm_effect_rate.c

@@ -140 +140 @@
 fm_effect_rate_init                     (FmEffectRate   *effect_rate)
 {
-        effect_rate->converter = 1;
+        effect_rate->converter = 3;
         effect_rate->change_rate = -1;
         effect_rate->rate = 1.00;

fm_server/trunk/src/fm_output_alsa.c

@@ -3 +3 @@
 #include <glib.h>
 #include <glib-object.h>
-#include <rgc.h>
+#include <rgc_server.h>
+
 #include <alsa/asoundlib.h>
 
@@ -12 +13 @@
 
 
-#define ALSA_DEFAULT_DEVICE "hw:0,0"
+#define ALSA_DEFAULT_DEVICE "default"
 #define ALSA_DEFAULT_BUFFER_TIME 22000
-#define ALSA_DEFAULT_PERIOD_TIME 5000
+#define ALSA_DEFAULT_PERIOD_TIME 10000
 
 extern gint temp_fd;
@@ -38 +39 @@
 static gboolean fm_output_alsa_deactivate (FmElement    *element);
 static void fm_output_alsa_finalize     (GObject        *object);
-
-static void fm_output_alsa_get_buffer   (FmElement      *element,
-                                         FmBuffer       *buffer);
-
-gint xrun_recovery                      (snd_pcm_t      *handle,
+static gint xrun_recovery               (snd_pcm_t      *handle,
                                          gint           err);
+static gpointer fm_output_alsa_play     (gpointer       data);
+static gboolean fm_output_alsa_start    (FmOutput       *output);
+                                 
 
 static FmOutputClass *parent_class = NULL;
@@ -76 +76 @@
 fm_output_alsa_class_register           (void)
 {
-        rgc_class_register ("FmOutputAlsa",
-                            FM_TYPE_OUTPUT_ALSA);
-
-        rgc_method_register ("connect_src",
-                             FM_TYPE_OUTPUT_ALSA,
-                             G_CALLBACK (fm_element_connect_src),
-                             rgc_marshal_VOID__ELEMENT,
-                             1, G_TYPE_STRING);
+        rgc_class_register (FM_TYPE_OUTPUT_ALSA);
 }
 
@@ -98 +91 @@
         gobject_class->set_property = fm_output_alsa_set_property;
         gobject_class->get_property = fm_output_alsa_get_property;
+        
         gobject_class->finalize = fm_output_alsa_finalize;
+//      gobject_class->dispose = 
         
         element_class->activate = fm_output_alsa_activate;
         element_class->deactivate = fm_output_alsa_deactivate;
-        element_class->get_buffer = fm_output_alsa_get_buffer;
-        
-        output_class->play = fm_output_alsa_play;
+        
+        output_class->start = fm_output_alsa_start;
+        //output_class->stop = fm_output_alsa_stop;
+        
         
         g_object_class_install_property (gobject_class,
@@ -145 +141 @@
         output_alsa->buffer_size = 0;
         output_alsa->period_size = 0;
-        output_alsa->engine_buffer = NULL;
+        output_alsa->thread = NULL;
+        output_alsa->stop_processing = FALSE;
 }
 
@@ -214 +211 @@
         FmOutputAlsa *output_alsa = FM_OUTPUT_ALSA (element);
         gint err;
-
-        g_assert ((FmElement *) g_list_nth_data (element->src_list, 0));
-        fm_element_activate ((FmElement *) g_list_nth_data (element->src_list, 0));
         
         g_print ("Activating FmOutputAlsa\n");
                 
-        
         // Open the device
         
@@ -265 +258 @@
         }
 
+        output->sample_rate = 44100;
         err = snd_pcm_hw_params_set_rate_near (output_alsa->sound_handle,
                                                output_alsa->hwparams,
@@ -272 +266 @@
                 return FALSE;
         }
-
+        
+        g_print ("ALSA sample rate: %d\n", output->sample_rate);
+
+        guint n_channels = FM_CHANNELS_STEREO;
         err = snd_pcm_hw_params_set_channels (output_alsa->sound_handle,
                                               output_alsa->hwparams,
-                                              output->channels_n);
-        if (err < 0) {
-                printf("snd_pcm_hw_params_set_channels %d: %s\n", output->channels_n, snd_strerror (err));
-                return FALSE;
-        }
-
-        guint dir = 0; // ???
+                                              n_channels);
+        if (err < 0) {
+                printf("snd_pcm_hw_params_set_channels %d: %s\n", n_channels, snd_strerror (err));
+                return FALSE;
+        }
+
+        gint dir = 0; // ???
         
         err = snd_pcm_hw_params_set_buffer_time_near (output_alsa->sound_handle,
@@ -319 +316 @@
         }
         
-        output->samples_per_buffer = output_alsa->period_size;
-
         err = snd_pcm_hw_params (output_alsa->sound_handle,
                                  output_alsa->hwparams);
@@ -329 +324 @@
         }
 
-        output->samples_per_buffer = output_alsa->period_size;
-                
-        // Our integer buffer
-        
-        output_alsa->engine_buffer = fm_buffer_new (MAX_SAMPLES,
-                FM_SAMPLES_INT16, FM_INTERLEAVING_NORMAL, FM_CHANNELS_STEREO);
+        output_alsa->buffer_size_samples = output_alsa->period_size;
+        output_alsa->main_buffer = fm_buffer_new (output_alsa->buffer_size_samples, FM_CHANNELS_STEREO);
+        output_alsa->buffer_int = g_new (gint16, output_alsa->buffer_size_samples * FM_CHANNELS_STEREO);
+                
+        /* We postpone this to set the pipeline's sample rate */
+        if (!fm_element_activate_connected (element))
+                return FALSE;
         
         return TRUE;
@@ -343 +339 @@
 fm_output_alsa_deactivate               (FmElement      *element)
 {
-        FmOutputAlsa *output_alsa = FM_OUTPUT_ALSA (element);
+        /*FmOutputAlsa *output_alsa = FM_OUTPUT_ALSA (element);
         gint err;
         
@@ -362 +358 @@
         output_alsa->buffer_size = 0;
         output_alsa->period_size = 0;
-        output_alsa->engine_buffer = NULL;
+        output_alsa->engine_buffer = NULL;*/
         
         return TRUE;
@@ -379 +375 @@
 
 
-
-
-static void
-fm_output_alsa_get_buffer               (FmElement      *element,
-                                         FmBuffer       *buffer)
-{
-        g_return_if_fail (FM_IS_OUTPUT_ALSA (element));
-        
-        g_assert (g_list_nth_data (element->src_list, 0));
-        /* FIXME */
-        fm_element_get_buffer (FM_ELEMENT (g_list_nth_data (element->src_list, 0)),
-                               buffer);
-        
-        return;
-}
-
-
-void
-fm_output_alsa_play                     (FmOutput       *output,
-                                         FmBuffer       *buffer)
-{
-        FmOutputAlsa *output_alsa = FM_OUTPUT_ALSA (output);
-        
-        fm_buffer_convert (buffer, output_alsa->engine_buffer);
-        
-        fm_buffer_dump_to_file (output_alsa->engine_buffer, temp_fd);
-        
-        gint err = 0;
-                
-        g_assert (output_alsa->sound_handle);
-
-        err = snd_pcm_writei (output_alsa->sound_handle,
-                              FM_BUFFER_DATA (output_alsa->engine_buffer),
-                              FM_BUFFER_USED_SAMPLES (output_alsa->engine_buffer));
-        if (err < 0) {
-                if (xrun_recovery (output_alsa->sound_handle, err) < 0) {
-                        g_print ("alsa: xrun1\n");
-                        return;         // FALSE
+static gboolean
+fm_output_alsa_start                    (FmOutput       *output)
+{
+        FmOutputAlsa *output_alsa = FM_OUTPUT_ALSA(output);
+        GError *error = NULL;
+                
+        output_alsa->thread = g_thread_create (fm_output_alsa_play, output_alsa,
+                                               FALSE, &error);
+        if (output_alsa->thread) {
+                g_print("ALSA output started!\n");
+                return TRUE;
+        } else {
+                g_warning("Failed starting ALSA output, %s", error->message);
+                return FALSE;
+        }
+}
+
+
+#define FLOAT_TO_INT(x) ((gint16) ((x) * 32768.0))
+
+static gpointer
+fm_output_alsa_play                     (gpointer       data)
+{
+        FmElement *element = FM_ELEMENT (data);
+        FmOutputAlsa *output_alsa = FM_OUTPUT_ALSA (data);
+        
+        while (!output_alsa->stop_processing) {
+        
+                //g_print("asking for %d samples\n", output_alsa->buffer_size_samples);
+                FM_BUFFER_REQUESTED(output_alsa->main_buffer) = output_alsa->buffer_size_samples;
+                fm_element_get_buffer_from_src(element, output_alsa->main_buffer);
+        
+                guint i;
+                gint16 *ptr = output_alsa->buffer_int;
+                for (i = 0; i < output_alsa->buffer_size_samples; i++) {
+                        *(ptr++) = FLOAT_TO_INT (output_alsa->main_buffer->channel_data[0][i]);
+                        *(ptr++) = FLOAT_TO_INT (output_alsa->main_buffer->channel_data[1][i]);
                 }
+        
+                gint err = 0;
                 
                 err = snd_pcm_writei (output_alsa->sound_handle,
-                                      FM_BUFFER_DATA (output_alsa->engine_buffer),
-                                      FM_BUFFER_USED_SAMPLES (output_alsa->engine_buffer));
-                
+                                      output_alsa->buffer_int, 
+                                      output_alsa->buffer_size_samples);
+                                      
                 if (err < 0) {
                         if (xrun_recovery (output_alsa->sound_handle, err) < 0) {
-                                g_print ("alsa: xrun2\n");
-                                return;         // FALSE
+                                g_print ("alsa: xrun1\n");
+                                continue;
+                        }
+                
+                        err = snd_pcm_writei (output_alsa->sound_handle,
+                                              output_alsa->buffer_int,
+                                              output_alsa->buffer_size_samples);
+                
+                        if (err < 0) {
+                                if (xrun_recovery (output_alsa->sound_handle, err) < 0) {
+                                        g_print ("alsa: xrun2\n");
+                                        continue;
+                                }       
                         }       
-                }       
-        }
-        return;         // TRUE
+                }
+        }
+        
+        g_print ("output_alsa->stop_processing == TRUE!\n");
+        
+        return NULL;
 }
 
 
 // Underrun and suspend recovery
-gint
+static gint
 xrun_recovery                           (snd_pcm_t      *handle,
                                          gint           err)

fm_server/trunk/src/fm_output_alsa.h

@@ -17 +17 @@
         gchar           *device_name;
         
+        GThread         *thread;
+        gboolean        stop_processing;
+        
         snd_pcm_t       *sound_handle;
         snd_output_t    *errlog;
@@ -29 +32 @@
         snd_pcm_uframes_t period_size;
         
-        FmBuffer        *engine_buffer;
+        guint           buffer_size_samples;
+        FmBuffer        *main_buffer;
+        gint16          *buffer_int;
 };
 
@@ -48 +53 @@
 fm_output_alsa_new                      (void);
 
-/*void
-fm_output_alsa_get_buffer               (FmElement      *element,
-                                         FmBuffer       *buffer);*/
-
-void
-fm_output_alsa_play                     (FmOutput       *output,
-                                         FmBuffer       *buffer);

fm_server/trunk/src/main.c

@@ -59 +59 @@
 #include "fm_output_alsa.h"
 #endif
-#include "fm_output_oss.h"
 #include "fm_output_jack.h"
 #include "fm_mixer.h"
@@ -157 +156 @@
         fm_mixer_dj_class_register ();*/
 #if HAVE_ALSA_ASOUNDLIB_H
-        //fm_output_alsa_class_register ();
+        fm_output_alsa_class_register ();
 #endif
         //fm_output_oss_class_register ();

fm_server/trunk/test/test_play_file.c

@@ -40 +40 @@
         rgc_remote_object_call (pipeline, "run", NULL);
         g_usleep(100);
-        rgc_remote_object_call (output, "connect_to_hw_ports", NULL);
+//      rgc_remote_object_call (output, "connect_to_hw_ports", NULL);
         g_usleep(100);
         //rgc_remote_object_call (input, "play", NULL);
@@ -70 +70 @@
         GValue *device_name = g_value_init_string ("default");
         rgc_remote_object_new_async (output_created_cb, NULL,
-                            "FmOutputJack", "output", NULL);
+//                          "FmOutputJack", "output", NULL);
+                            "FmOutputAlsa", "output", NULL);
         g_value_destroy (device_name);
 }

fm_server/trunk/test/test_simple.c

@@ -34 +34 @@
         rgc_remote_object_call (pipeline, "activate", NULL);
         rgc_remote_object_call (pipeline, "run", NULL);
-        rgc_remote_object_call (output, "connect_to_hw_ports", NULL);
+//      rgc_remote_object_call (output, "connect_to_hw_ports", NULL);
 
         sleep (200);
@@ -92 +92 @@
         GValue *device_name = g_value_init_string ("default");
         rgc_remote_object_new_async (output_created_cb, NULL,
-                            "FmOutputJack", "output", NULL);
+//                          "FmOutputJack", "output", NULL);
+                            "FmOutputAlsa", "output", NULL);
         g_value_destroy (device_name);
 }

rgc/trunk/AUTHORS

@@ -1 +1 @@
 Main author and mantainer:
-    Alberto Botti <athproject@hotpop.com>
+    Alberto Botti <alberto.botti@yoda2000.net>
     
 Based on many ideas and source code from the GLib library:
@@ -11 +11 @@
 
 Distributed under the terms of the GNU Library General Public License (LGPL)
-version 2.
+version 2 or later.

rgc/trunk/intltool-merge

@@ -258 +258 @@
 {
     my ($encoding) = @_;
-    my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/usr/local/lib/charset.alias";
+    my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/home/ath/test/lib/charset.alias";
 
     # seek character encoding aliases in charset.alias (glib)

rgc/trunk/intltool-update

@@ -558 +558 @@
 sub GenerateHeaders
 {
-    my $EXTRACT = "/home/ath/Projects/fm/freemix/rgc/trunk/intltool-extract";
+    my $EXTRACT = "/home/ath/Desktop/Progetti/fm/freemix/rgc/trunk/intltool-extract";
     chomp $EXTRACT;