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

Commit 1294844a authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "include: media: add DEVICE_OUT_HDMI this is for HDMI out on the Supersonic" into gingerbread

parents 7726c0bb 951c45fc

include/media/AudioSystem.h

+2 −1
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ public: 
        DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES = 0x100,

        DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER = 0x200,

        DEVICE_OUT_AUX_DIGITAL = 0x400,

        DEVICE_OUT_HDMI = 0x20000,

#ifdef HAVE_FM_RADIO

        DEVICE_OUT_FM = 0x800,

        DEVICE_OUT_FM_SPEAKER = 0x1000,
@@ -282,7 +283,7 @@ public: 
                DEVICE_OUT_WIRED_HEADPHONE | DEVICE_OUT_BLUETOOTH_SCO | DEVICE_OUT_BLUETOOTH_SCO_HEADSET |

#endif

                DEVICE_OUT_BLUETOOTH_SCO_CARKIT | DEVICE_OUT_BLUETOOTH_A2DP | DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |

                DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER | DEVICE_OUT_AUX_DIGITAL | DEVICE_OUT_DEFAULT),

                DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER | DEVICE_OUT_AUX_DIGITAL | DEVICE_OUT_HDMI | DEVICE_OUT_DEFAULT),

        DEVICE_OUT_ALL_A2DP = (DEVICE_OUT_BLUETOOTH_A2DP | DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |

                DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER),