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

Commit c7747980 authored by Tom Cherry's avatar Tom Cherry
Browse files

resolve merge conflicts of d9da8421 to master 

Change-Id: I5312c2851d03f80dd02e2ad91ff35d962f02ab45
parents b7bb9073 d9da8421

hal/audio_hw.h

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ struct stream_in { 
    card_status_t card_status;

};



typedef enum {

typedef enum usecase_type_t {

    PCM_PLAYBACK,

    PCM_CAPTURE,

    VOICE_CALL,

hal/platform_api.h

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ struct amp_db_and_gain_table { 


enum card_status_t;

struct audio_usecase;

enum usecase_type_t;



void *platform_init(struct audio_device *adev);

void platform_deinit(void *platform);
@@ -43,7 +44,7 @@ int platform_get_snd_device_index(char *snd_device_index_name); 
int platform_set_snd_device_acdb_id(snd_device_t snd_device, unsigned int acdb_id);

int platform_get_snd_device_acdb_id(snd_device_t snd_device);

int platform_send_audio_calibration(void *platform, snd_device_t snd_device);

int platform_get_default_app_type_v2(void *platform, usecase_type_t type, int *app_type);

int platform_get_default_app_type_v2(void *platform, enum usecase_type_t type, int *app_type);

int platform_switch_voice_call_device_pre(void *platform);

int platform_switch_voice_call_enable_device_config(void *platform,

                                                    snd_device_t out_snd_device,