Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4900c5c9 authored by Jef Oliver's avatar Jef Oliver Committed by Gerrit Code Review
Browse files

Merge "FM Radio: Add support for FM Radio in Android" into cm-10.1

parents e15eebac 36c0ce89

include/system/audio.h

+13 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ typedef enum { 
                                          /* An example of remote presentation is Wifi Display */

                                          /*  where a dongle attached to a TV can be used to   */

                                          /*  play the mix captured by this audio source.      */

    AUDIO_SOURCE_FM_RADIO_RX         = 9,

    AUDIO_SOURCE_CNT,

    AUDIO_SOURCE_MAX                 = AUDIO_SOURCE_CNT - 1,

} audio_source_t;
@@ -367,6 +368,9 @@ enum { 
    AUDIO_DEVICE_OUT_PROXY                     = 0x40000,

    AUDIO_DEVICE_OUT_FM                        = 0x80000,

    AUDIO_DEVICE_OUT_FM_TX                     = 0x100000,

#endif

#ifdef STE_FM

    AUDIO_DEVICE_OUT_FM_TX                     = 0x10000,

#endif

    AUDIO_DEVICE_OUT_DEFAULT                   = AUDIO_DEVICE_BIT_DEFAULT,

    AUDIO_DEVICE_OUT_ALL      = (AUDIO_DEVICE_OUT_EARPIECE |
@@ -391,6 +395,9 @@ enum { 
                                 AUDIO_DEVICE_OUT_PROXY |

                                 AUDIO_DEVICE_OUT_FM |

                                 AUDIO_DEVICE_OUT_FM_TX |

#endif

#ifdef STE_FM

                                 AUDIO_DEVICE_OUT_FM_TX |

#endif

                                 AUDIO_DEVICE_OUT_DEFAULT),

    AUDIO_DEVICE_OUT_ALL_A2DP = (AUDIO_DEVICE_OUT_BLUETOOTH_A2DP |
@@ -437,6 +444,9 @@ enum { 
    AUDIO_DEVICE_IN_PROXY                 = AUDIO_DEVICE_BIT_IN | 0x4000,

    AUDIO_DEVICE_IN_FM_RX                 = AUDIO_DEVICE_BIT_IN | 0x8000,

    AUDIO_DEVICE_IN_FM_RX_A2DP            = AUDIO_DEVICE_BIT_IN | 0x10000,

#endif

#ifdef STE_FM

    AUDIO_DEVICE_IN_FM_RX                 = AUDIO_DEVICE_BIT_IN | 0x2000,

#endif

    AUDIO_DEVICE_IN_DEFAULT               = AUDIO_DEVICE_BIT_IN | AUDIO_DEVICE_BIT_DEFAULT,

#endif
@@ -459,6 +469,9 @@ enum { 
                               AUDIO_DEVICE_IN_FM_RX |

                               AUDIO_DEVICE_IN_FM_RX_A2DP |

                               AUDIO_DEVICE_IN_PROXY |

#endif

#ifdef STE_FM

                               AUDIO_DEVICE_IN_FM_RX |

#endif

                               AUDIO_DEVICE_IN_DEFAULT),

    AUDIO_DEVICE_IN_ALL_SCO = AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET,