Changeset 112 for fm_server/trunk/src/main.c

Timestamp:

09/04/06 20:29:59 (6 years ago)

Author:

ath

Message:

Use some decent float-integer converstion routines, and make FmPipeline more useful.

Files:

• fm_server/trunk/src/main.c (modified) (3 diffs)

fm_server/trunk/src/main.c

@@ -86 +86 @@
 
 
-
-//gint buffer_elems = 0;                // element = 1 * channels_n
-//gint buffer_int_size = 0;     // buffer_int_size = sizeof (int16_t) * buffer_elems
-//gint buffer_fp_size = 0;      // buffer_int_size = sizeof (gfloat) * buffer_elems
-
-gboolean
-timeout                                 (gpointer       user_data)
-{
-        /*g_print ("Timeout!\n");
-        
-        FmEngine *data = (FmEngine *) user_data;
-        
-        if (fm_engine_is_running (data))
-                fm_engine_stop (data);
-        else
-                fm_engine_start (data);
-        */
-        
-        exit (0);
-        return (TRUE);
-}
-
-
 gint
 main                                    (gint           argc,
@@ -152 +129 @@
         fm_mixer_class_register ();
         fm_djmixer_class_register ();
-/*      fm_effect_pan_class_register ();
-
-        fm_mixer_dj_class_register ();*/
+        fm_effect_pan_class_register ();
 #if HAVE_ALSA_ASOUNDLIB_H
         fm_output_alsa_class_register ();
 #endif
-        //fm_output_oss_class_register ();
 
-//      test_case ();
-        
-        /*RgcMessageNew *mess1;
-        mess1 = rgc_message_new_create ("cdj1", "FmInputCDJ");
-        rgc_message_execute_new (mess1)*/
-        
         GMainLoop *main_loop;
         main_loop = g_main_loop_new (NULL, FALSE);      
 
         /*unlink ("/tmp/fmraw.raw");
-        temp_fd = open ("/tmp/fmraw.raw", (O_WRONLY && O_SYNC));*/
-        g_assert (temp_fd != -1);
+        temp_fd = open ("/tmp/fmraw.raw", (O_WRONLY && O_SYNC));
+        g_assert (temp_fd != -1);*/
 
-        /*main_conn = fm_connection_unix_new ("/tmp/fm");
-        main_connection = FM_CONNECTION (main_conn);
-        g_idle_add ((GSourceFunc) fm_connection_start, main_conn);*/
-                
-        //g_timeout_add (100000, timeout, NULL);
-        
         g_main_loop_run (main_loop);
         
@@ -195 +157 @@
 
 
-/*void
-test_case                               (void)
-{
-        FmPipeline *pipeline;
-        FmElement *input;
-        FmElement *output;
-        
-        pipeline = fm_pipeline_new ();
-        input = FM_ELEMENT (fm_input_cdj_new ());
-        output = FM_ELEMENT (fm_output_oss_new ());
-        
-        fm_element_connect_src (output, input);
-        
-        fm_pipeline_set_sink (pipeline, output);
-        
-        fm_pipeline_activate (pipeline);
-        
-        fm_pipeline_run (pipeline);
-        
-        g_object_set (G_OBJECT (input), "filename", "/tmp/b.mp3", NULL);
-        
-        fm_input_cdj_load (FM_INPUT_CDJ (input));
-}*/
-
-
-/*void
-test_case                               (void)
-{
-        FmElement *input;
-        
-        input = FM_ELEMENT (fm_input_cdj_new ());
-        
-        fm_element_activate (input);
-        
-        g_object_set (G_OBJECT (input), "filename", "/tmp/b.mp3", NULL);
-        fm_input_cdj_load (FM_INPUT_CDJ (input));
-        
-        FmBuffer *buffer = fm_buffer_new (MAX_SAMPLES, FM_SAMPLES_FLOAT,
-                                          FM_INTERLEAVING_NORMAL, FM_CHANNELS_STEREO);
-        FM_BUFFER_REQUESTED (buffer) = 32;
-        
-        FmBuffer *out_buffer = fm_buffer_new (MAX_SAMPLES, FM_SAMPLES_INT16,
-                                    FM_INTERLEAVING_NORMAL, FM_CHANNELS_STEREO);
-        
-        while (TRUE) {
-                fm_element_get_buffer (input, buffer);
-
-                fm_buffer_convert (buffer, out_buffer);
-                                
-                fm_buffer_dump_to_file (out_buffer, temp_fd);
-        }
-        
-        fm_buffer_destroy (buffer);
-        fm_buffer_destroy (out_buffer);
-}*/
-
-#define SEGMENT_SIZE 64
-
-/*void
-test_case                               (void)
-{
-        FmGstThread *thread;
-        
-        thread = fm_gst_thread_new ();
-        
-        fm_gst_thread_load (thread, "/tmp/b.mp3");
-        
-                
-        FmBuffer *buffer = NULL;
-        buffer = fm_buffer_new (SEGMENT_SIZE, FM_SAMPLES_INT16,
-                                FM_INTERLEAVING_NORMAL, FM_CHANNELS_STEREO);
-
-        FmBuffer *float_buffer = NULL;
-        float_buffer = fm_buffer_new (SEGMENT_SIZE, FM_SAMPLES_FLOAT,
-                                      FM_INTERLEAVING_NORMAL, FM_CHANNELS_STEREO);
-
-        FmBuffer *out_buffer = NULL;//g_print ("%d\n", BUF_READ);
-        out_buffer = fm_buffer_new (SEGMENT_SIZE, FM_SAMPLES_INT16,
-                                    FM_INTERLEAVING_NORMAL, FM_CHANNELS_STEREO);
-        
-        while (TRUE) {
-                fm_gst_thread_get_buffer (thread, buffer);
-                
-                fm_buffer_convert (buffer, float_buffer);
-                fm_buffer_convert (float_buffer, out_buffer);
-                                
-                fm_buffer_dump_to_file (out_buffer, temp_fd);
-        }
-        
-        fm_buffer_destroy (buffer);
-        fm_buffer_destroy (float_buffer);
-        fm_buffer_destroy (out_buffer);
-}*/