Fixed N_SE-38563, N_SE-38552

[apps/osp/Settings.git] / src / StSoundsForm.cpp

diff --git a/src/StSoundsForm.cpp b/src/StSoundsForm.cpp
index 4a6feba..36b96bb 100644 (file)
--- a/src/StSoundsForm.cpp
+++ b/src/StSoundsForm.cpp
@@ -141,7 +141,7 @@ SoundsForm::OnInitializing(void)
        SettingInfo::GetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, __systemVolume);
 
        SettingInfo::SetValue(SETTING_INFO_KEY_SOUND_MEDIA_VOLUME, 15);
-       SettingInfo::SetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, 0);
+       SettingInfo::SetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, 15);
 
        __pSoundPlay = new (std::nothrow) Player();
        r = __pSoundPlay->Construct(*this);
@@ -381,8 +381,8 @@ SoundsForm::CreateGroupItem(int groupIndex, int itemWidth)
 
        pItem->AddControl(pLabel);
        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
-       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
-       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+       relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+       relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
        pItem->SetEnabled(false);
 
        return pItem;
@@ -476,8 +476,8 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        pItem->AddControl(pLabel);
                        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
-                       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
-                       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+                       relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+                       relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
                }
                else
                {
@@ -507,8 +507,8 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        pItem->AddControl(pLabel);
                        relativeLayout.SetMargin(*pLabel, itemMainRectangle.x, RELATIVE_LAYOUT_RIGHT_MARGIN, 0, 0);
-                       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
-                       relativeLayout.SetRelation(*pLabel, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+                       relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+                       relativeLayout.SetRelation(*pLabel, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
                }
        }
 
@@ -568,8 +568,8 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pItem->AddControl(pSlider);
                        pItem->SetIndividualSelectionEnabled(pSlider, true);
 
-                       relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
-                       relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+                       relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+                       relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
                }
                else
                {
@@ -674,8 +674,8 @@ SoundsForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                        pItem->AddControl(pSlider);
                        pItem->SetIndividualSelectionEnabled(pSlider, true);
 
-                       relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
-                       relativeLayout.SetRelation(*pSlider, *pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+                       relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+                       relativeLayout.SetRelation(*pSlider, pItem, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
 
                        __pTableView->SetItemEnabled(groupIndex, itemIndex, false);
                }
@@ -1056,7 +1056,7 @@ SoundsForm::OnFocusGained(const Tizen::Ui::Control& source)
        SettingInfo::GetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, __systemVolume);
 
        SettingInfo::SetValue(SETTING_INFO_KEY_SOUND_MEDIA_VOLUME, 15);
-       SettingInfo::SetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, 0);
+       SettingInfo::SetValue(SETTING_INFO_KEY_SOUND_SYSTEM_VOLUME, 15);
 }
 
 void