Changeset 228 for trunk

Show
Ignore:
Timestamp:
02/08/08 19:39:57 (4 years ago)
Author:
ath
Message:

Add support for PulseAudio? sink selection to FmGui.

Location:
trunk/fm_gui/src
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/fm_gui/src/base.c

    r140 r228  
    1616extern gchar *BACKEND_ALSA; 
    1717extern gchar *BACKEND_JACK; 
     18extern gchar *BACKEND_PULSE; 
    1819 
    1920 
    … …  
    9798                rgc_remote_object_new_async (base_output_created_cb, data, 
    9899                                             "FmOutputAlsa", "output", NULL); 
     100        else if (global_backend == BACKEND_PULSE)  
     101                rgc_remote_object_new_async (base_output_created_cb, data, 
     102                                             "FmOutputPulse", "output", NULL); 
    99103        else 
    100104                g_assert_not_reached (); 

  • trunk/fm_gui/src/main.c

    r144 r228  
    1414gchar *BACKEND_ALSA = "ALSA"; 
    1515gchar *BACKEND_JACK = "JACK"; 
     16gchar *BACKEND_PULSE = "PULSE"; 
    1617 
    1718 
    … …  
    3435                { "hostname", 'h', 0, G_OPTION_ARG_STRING, &hostname, "Hostname of the server", "H" }, 
    3536                { "trans", 't', 0, G_OPTION_ARG_STRING, &hostname, "URI translation (\"client>server\", ex. \"/mnt/media>c:\\media\")", "T" }, 
    36                 { "output", 'o', 0, G_OPTION_ARG_STRING, &aoutput, "Audio output (available values: \"jack\", \"alsa\" ", "O" }, 
     37                { "output", 'o', 0, G_OPTION_ARG_STRING, &aoutput, "Audio output (available values: \"jack\", \"alsa\", \"pulse\" ", "O" }, 
    3738                { NULL } 
    3839        }; 
    … …  
    5152        else if (strcmp (aoutput, "alsa") == 0) 
    5253                        global_backend = BACKEND_ALSA; 
     54        else if (strcmp (aoutput, "pulse") == 0) 
     55                        global_backend = BACKEND_PULSE; 
    5356        else 
    5457                g_error ("Unknown audio output \"%s\"", aoutput);