X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=ucs2-vol%2Fsrc%2Fsetup.cpp;h=bb54f2f8279cb3bbfa2ca47a038d634db6481084;hb=e177a9e1fa78ef9d0ec7de851f414f9f9efd131d;hp=5ff3d790a6c7974e8bd49b9e0541c19cfbdb2029;hpb=d2e42029ec04c3f224580f8007cdfbbfe0fc47a6;p=apps%2Fagl-service-unicens.git diff --git a/ucs2-vol/src/setup.cpp b/ucs2-vol/src/setup.cpp index 5ff3d79..bb54f2f 100644 --- a/ucs2-vol/src/setup.cpp +++ b/ucs2-vol/src/setup.cpp @@ -28,9 +28,9 @@ CSetup* CSetup::_instance = NULL; // singleton CSetup* CSetup::GetInstance() { if (_instance == NULL) { - _instance = new CSetup(); + _instance = new CSetup(); } - + return _instance; } @@ -53,7 +53,7 @@ CSetup::CSetup() _volume_amp_272_l(0x272U, DEVICE_VAL_LEFT, LIB_MOST_VOLUME_CH_CENTER), _volume_amp_272_r(0x272U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_SUB), _value_container() -{ +{ static CDeviceValue* value_list[3] = { &_volume_amp_270_m, &_volume_amp_270_l, &_volume_amp_270_r/*, @@ -72,10 +72,10 @@ CSetup::~CSetup() } -void CSetup::Configure(Ucs_Inst_t *unicens_inst, lib_most_volume_service_cb_t service_fptr) +void CSetup::Configure(Ucs_Inst_t *UNICENS_inst, lib_most_volume_service_cb_t service_fptr) { - ucs_inst = unicens_inst; - _value_container.AssignService(service_fptr, unicens_inst); + ucs_inst = UNICENS_inst; + _value_container.AssignService(service_fptr, UNICENS_inst); } Ucs_Inst_t* CSetup::RetrieveUnicensInst(void) @@ -91,4 +91,4 @@ void CSetup::SetVolume(enum lib_most_volume_channel_t channel, uint8_t volume) void CSetup::Update() { _value_container.Update(); -} \ No newline at end of file +}