diff options
| author | Tim O'Shea <tim.oshea753@gmail.com> | 2013-06-04 17:57:30 -0400 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-05 16:10:19 -0400 |
| commit | 36f8fe8f83bc867d7f1e00725a9f13415b863540 (patch) | |
| tree | 634c4c91ba3cb8139736b7b4becefd2ef4749f88 | |
| parent | 65d15a1975081d4c8622134880ed331956d34c60 (diff) | |
audio: switch default also device from hw:0,0 to default, Bug #551
Conflicts:
gr-audio/lib/alsa/alsa_sink.cc
gr-audio/lib/alsa/alsa_source.cc
| -rw-r--r-- | gr-audio/lib/alsa/audio_alsa_sink.cc | 2 | ||||
| -rw-r--r-- | gr-audio/lib/alsa/audio_alsa_source.cc | 2 | ||||
| -rw-r--r-- | gr-audio/lib/alsa/gr-audio-alsa.conf | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/gr-audio/lib/alsa/audio_alsa_sink.cc b/gr-audio/lib/alsa/audio_alsa_sink.cc index 687f24bde2..0da1245fff 100644 --- a/gr-audio/lib/alsa/audio_alsa_sink.cc +++ b/gr-audio/lib/alsa/audio_alsa_sink.cc @@ -54,7 +54,7 @@ static snd_pcm_format_t acceptable_formats[] = { static std::string default_device_name () { - return gr_prefs::singleton()->get_string("audio_alsa", "default_output_device", "hw:0,0"); + return gr_prefs::singleton()->get_string("audio_alsa", "default_output_device", "default"); } static double diff --git a/gr-audio/lib/alsa/audio_alsa_source.cc b/gr-audio/lib/alsa/audio_alsa_source.cc index 9fdf80b43f..408bdfe57c 100644 --- a/gr-audio/lib/alsa/audio_alsa_source.cc +++ b/gr-audio/lib/alsa/audio_alsa_source.cc @@ -53,7 +53,7 @@ static snd_pcm_format_t acceptable_formats[] = { static std::string default_device_name () { - return gr_prefs::singleton()->get_string("audio_alsa", "default_input_device", "hw:0,0"); + return gr_prefs::singleton()->get_string("audio_alsa", "default_input_device", "default"); } static double diff --git a/gr-audio/lib/alsa/gr-audio-alsa.conf b/gr-audio/lib/alsa/gr-audio-alsa.conf index 5cec63e7ab..6fb7643b11 100644 --- a/gr-audio/lib/alsa/gr-audio-alsa.conf +++ b/gr-audio/lib/alsa/gr-audio-alsa.conf @@ -4,8 +4,8 @@ [audio_alsa] -default_input_device = hw:0,0 -default_output_device = hw:0,0 +default_input_device = default +default_output_device = default period_time = 0.010 # in seconds nperiods = 4 # total buffering = period_time * nperiods verbose = false |