Revision 98f9f48c audio/alsaaudio.c

b/audio/alsaaudio.c
786 786
        int add;
787 787
        int len;
788 788
    } bufs[2] = {
789
        {.add = hw->wpos,
790
         .len = 0},
791
        {.add = 0,
792
         .len = 0}
789
        { .add = hw->wpos, .len = 0 },
790
        { .add = 0,        .len = 0 }
793 791
    };
794 792
    snd_pcm_sframes_t avail;
795 793
    snd_pcm_uframes_t read_samples = 0;
......
937 935
}
938 936

  
939 937
static struct audio_option alsa_options[] = {
940
    {.name        = "DAC_SIZE_IN_USEC",
941
     .tag         = AUD_OPT_BOOL,
942
     .valp        = &conf.size_in_usec_out,
943
     .descr       = "DAC period/buffer size in microseconds (otherwise in frames)"},
944
    {.name        = "DAC_PERIOD_SIZE",
945
     .tag         = AUD_OPT_INT,
946
     .valp        = &conf.period_size_out,
947
     .descr       = "DAC period size (0 to go with system default)",
948
     .overriddenp = &conf.period_size_out_overridden},
949
    {.name        = "DAC_BUFFER_SIZE",
950
     .tag         = AUD_OPT_INT,
951
     .valp        = &conf.buffer_size_out,
952
     .descr       = "DAC buffer size (0 to go with system default)",
953
     .overriddenp = &conf.buffer_size_out_overridden},
954
    {.name        = "ADC_SIZE_IN_USEC",
955
     .tag         = AUD_OPT_BOOL,
956
     .valp        = &conf.size_in_usec_in,
957
     .descr       = "ADC period/buffer size in microseconds (otherwise in frames)"},
958
    {.name        = "ADC_PERIOD_SIZE",
959
     .tag         = AUD_OPT_INT,
960
     .valp        = &conf.period_size_in,
961
     .descr       = "ADC period size (0 to go with system default)",
962
     .overriddenp = &conf.period_size_in_overridden},
963
    {.name        = "ADC_BUFFER_SIZE",
964
     .tag         = AUD_OPT_INT,
965
     .valp        = &conf.buffer_size_in,
966
     .descr       = "ADC buffer size (0 to go with system default)",
967
     .overriddenp = &conf.buffer_size_in_overridden},
968
    {.name        = "THRESHOLD",
969
     .tag         = AUD_OPT_INT,
970
     .valp        = &conf.threshold,
971
     .descr       = "(undocumented)"},
972
    {.name        = "DAC_DEV",
973
     .tag         = AUD_OPT_STR,
974
     .valp        = &conf.pcm_name_out,
975
     .descr       = "DAC device name (for instance dmix)"},
976
    {.name        = "ADC_DEV",
977
     .tag         = AUD_OPT_STR,
978
     .valp        = &conf.pcm_name_in,
979
     .descr       = "ADC device name"},
980
    {.name        = "VERBOSE",
981
     .tag         = AUD_OPT_BOOL,
982
     .valp        = &conf.verbose,
983
     .descr       = "Behave in a more verbose way"},
938
    {
939
        .name        = "DAC_SIZE_IN_USEC",
940
        .tag         = AUD_OPT_BOOL,
941
        .valp        = &conf.size_in_usec_out,
942
        .descr       = "DAC period/buffer size in microseconds (otherwise in frames)"
943
    },
944
    {
945
        .name        = "DAC_PERIOD_SIZE",
946
        .tag         = AUD_OPT_INT,
947
        .valp        = &conf.period_size_out,
948
        .descr       = "DAC period size (0 to go with system default)",
949
        .overriddenp = &conf.period_size_out_overridden
950
    },
951
    {
952
        .name        = "DAC_BUFFER_SIZE",
953
        .tag         = AUD_OPT_INT,
954
        .valp        = &conf.buffer_size_out,
955
        .descr       = "DAC buffer size (0 to go with system default)",
956
        .overriddenp = &conf.buffer_size_out_overridden
957
    },
958
    {
959
        .name        = "ADC_SIZE_IN_USEC",
960
        .tag         = AUD_OPT_BOOL,
961
        .valp        = &conf.size_in_usec_in,
962
        .descr       =
963
        "ADC period/buffer size in microseconds (otherwise in frames)"
964
    },
965
    {
966
        .name        = "ADC_PERIOD_SIZE",
967
        .tag         = AUD_OPT_INT,
968
        .valp        = &conf.period_size_in,
969
        .descr       = "ADC period size (0 to go with system default)",
970
        .overriddenp = &conf.period_size_in_overridden
971
    },
972
    {
973
        .name        = "ADC_BUFFER_SIZE",
974
        .tag         = AUD_OPT_INT,
975
        .valp        = &conf.buffer_size_in,
976
        .descr       = "ADC buffer size (0 to go with system default)",
977
        .overriddenp = &conf.buffer_size_in_overridden
978
    },
979
    {
980
        .name        = "THRESHOLD",
981
        .tag         = AUD_OPT_INT,
982
        .valp        = &conf.threshold,
983
        .descr       = "(undocumented)"
984
    },
985
    {
986
        .name        = "DAC_DEV",
987
        .tag         = AUD_OPT_STR,
988
        .valp        = &conf.pcm_name_out,
989
        .descr       = "DAC device name (for instance dmix)"
990
    },
991
    {
992
        .name        = "ADC_DEV",
993
        .tag         = AUD_OPT_STR,
994
        .valp        = &conf.pcm_name_in,
995
        .descr       = "ADC device name"
996
    },
997
    {
998
        .name        = "VERBOSE",
999
        .tag         = AUD_OPT_BOOL,
1000
        .valp        = &conf.verbose,
1001
        .descr       = "Behave in a more verbose way"
1002
    },
984 1003
    { /* End of list */ }
985 1004
};
986 1005

  

Also available in: Unified diff