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

Commit cf8cbe1a authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Rewrite multicharacter constant using constexpr" am: 991667ba am:... 

Merge "Rewrite multicharacter constant using constexpr" am: 991667ba am: 3f6292ea am: 2ef0bdaf
am: 860f72ff

Change-Id: I89f0b62dac94e9617214ff40709e3b6c5954eddd
parents d5038a59 860f72ff

include/gui/DisplayEventReceiver.h

+9 −3
Original line number Original line Diff line number Diff line
@@ -35,13 +35,19 @@ namespace android { 
class BitTube;

class BitTube;

class IDisplayEventConnection;

class IDisplayEventConnection;





// ----------------------------------------------------------------------------

static inline constexpr uint32_t fourcc(char c1, char c2, char c3, char c4) {

    return static_cast<uint32_t>(c1) << 24 |

        static_cast<uint32_t>(c2) << 16 |

        static_cast<uint32_t>(c3) << 8 |

        static_cast<uint32_t>(c4);

}





// ----------------------------------------------------------------------------

class DisplayEventReceiver {

class DisplayEventReceiver {

public:

public:

    enum {

    enum {

        DISPLAY_EVENT_VSYNC = 'vsyn',

        DISPLAY_EVENT_VSYNC = fourcc('v', 's', 'y', 'n'),

        DISPLAY_EVENT_HOTPLUG = 'plug'

        DISPLAY_EVENT_HOTPLUG = fourcc('p', 'l', 'u', 'g'),

    };

    };





    struct Event {

    struct Event {