Changeset 191

Timestamp:

01/16/08 13:29:17 (4 years ago)

Author:

ath

Message:

Output driver fixes.

Location:

fm_server/trunk/src

Files:

• fm_output_alsa.c (modified) (5 diffs)
• fm_output_alsa.h (modified) (2 diffs)
• fm_output_jack.c (modified) (7 diffs)
• fm_output_jack.h (modified) (2 diffs)

fm_server/trunk/src/fm_output_alsa.c

@@ -1 +1 @@
 /*
  *  FreeMix - sound server
- *  Copyright (C) 2006 Alberto Botti <alberto.botti@yoda2000.net>
+ *  Copyright (C) 2006-2008 Alberto Botti <alberto.botti@yoda2000.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -16 +16 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *
+ *  fm_output_alsa.c - Output element for the JACK audio subsystem
+ *
+ *  (a lot of this code comes from AlsaPlayer and TerminatorX)
+ *
  */
  
-
-/* Most of this stuff came from AlsaPlayer. */
 
 #include <glib.h>
@@ -38 +42 @@
 
 #define ALSA_DEFAULT_DEVICE "default"
+//#define ALSA_DEFAULT_DEVICE "surround40"
 #define ALSA_DEFAULT_SAMPLE_RATE 44100
+//#define ALSA_DEFAULT_SAMPLE_RATE 48000
 #define ALSA_DEFAULT_BUFFER_TIME 22000
 #define ALSA_DEFAULT_PERIOD_TIME 10000
@@ -288 +294 @@
         }
 
-        output->sample_rate = 44100;
+//      output->sample_rate = 44100;
+        output->sample_rate = ALSA_DEFAULT_SAMPLE_RATE;
         err = snd_pcm_hw_params_set_rate_near (output_alsa->sound_handle,
                                                output_alsa->hwparams,
@@ -437 +444 @@
                 //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);
-
-                FmSync *sync = fm_element_pipeline_get_sync_info (element);
-                fm_sync_update_cycle (sync);
+                fm_element_get_buffer_from_src(element, output_alsa->main_buffer, NULL);
+
+/*              FmSync *sync = fm_element_pipeline_get_sync_info (element);
+                fm_sync_update_cycle (sync);            FIXME: obsoleted */
         
                 src_float_to_short_array_stereo (output_alsa->main_buffer->channel_data[0],

fm_server/trunk/src/fm_output_alsa.h

@@ -1 +1 @@
 /*
  *  FreeMix - sound server
- *  Copyright (C) 2006 Alberto Botti <alberto.botti@yoda2000.net>
+ *  Copyright (C) 2006-2008 Alberto Botti <alberto.botti@yoda2000.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -16 +16 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *
+ *  fm_output_alsa.h - Output element for the JACK audio subsystem
+ *
+ *  (a lot of this code comes from AlsaPlayer and TerminatorX)
+ *
  */
 

fm_server/trunk/src/fm_output_jack.c

@@ +1 @@
+/*
+ *  FreeMix - sound server
+ *  Copyright (C) 2008 Alberto Botti <alberto.botti@yoda2000.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *
+ *  fm_output_jack.c - Output element for the JACK audio subsystem
+ *
+ *  (a lot of this code comes from the JACK programming examples)
+ *
+ */
+
+
 #include <glib.h>
 #include <glib-object.h>
@@ -139 +165 @@
         FmOutputJack *output_jack = FM_OUTPUT_JACK (element);
 
+        if (!output_jack->client) {
+                g_warning ("Can't activate FmOutputJack - not initialized\n");
+                return FALSE;
+        }
+
         g_print ("Activating FmOutputJack\n");
+
         
         /* Creating the ports... */
@@ -184 +216 @@
 jack_start                              (FmOutput       *output)
 {
-        FmOutputJack *output_jack = FM_OUTPUT_JACK(output);
+        FmElement *element = FM_ELEMENT (output);
+        FmOutputJack *output_jack = FM_OUTPUT_JACK (output);
+
+        g_return_val_if_fail (element->active, FALSE);
 
         if (jack_activate(output_jack->client) == 0) {
@@ -199 +234 @@
 jack_stop                               (FmOutput       *output)
 {
-        FmOutputJack *output_jack = FM_OUTPUT_JACK(output);
+        FmElement *element = FM_ELEMENT (output);
+        FmOutputJack *output_jack = FM_OUTPUT_JACK (output);
+
+        g_return_val_if_fail (element->active, FALSE);
 
         if (jack_deactivate(output_jack->client) == 0) {
@@ -214 +252 @@
 jack_connect_to_hw_ports                (FmOutputJack   *output_jack)
 {
-        /* FIXME: check if activated */
+        FmElement *element = FM_ELEMENT (output_jack);
+        g_return_if_fail (element->active);
         
         const char **ports = jack_get_ports (output_jack->client,
@@ -293 +332 @@
 
         FM_BUFFER_REQUESTED(output_jack->main_buffer) = nframes;
-        fm_element_get_buffer_from_src(element, output_jack->main_buffer);
+        fm_element_get_buffer_from_src(element, output_jack->main_buffer, NULL);
 
         memcpy(left, FM_BUFFER_CHANNEL_DATA(output_jack->main_buffer, 0),
@@ -300 +339 @@
                nframes * sizeof(jack_default_audio_sample_t));
 
-        FmSync *sync = fm_element_pipeline_get_sync_info (element);
-        fm_sync_update_cycle (sync);
+/*      FmSync *sync = fm_element_pipeline_get_sync_info (element);
+        fm_sync_update_cycle (sync);           FIXME: obsoleted */
         
         return 0;

fm_server/trunk/src/fm_output_jack.h

@@ -1 +1 @@
 /*
  *  FreeMix - sound server
- *  Copyright (C) 2006 Alberto Botti <alberto.botti@yoda2000.net>
+ *  Copyright (C) 2008 Alberto Botti <alberto.botti@yoda2000.net>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -16 +16 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *
+ *  fm_output_jack.h - Output element for the JACK audio subsystem
+ *
+ *  (a lot of this code comes from the JACK programming examples)
+ *
  */