Changeset 60 in svn for trunk/zasc/app_c/DST_WinChannelEdit.c

Timestamp:

Oct 21, 2015 1:32:10 PM (10 years ago)

Author:

phkim

Message:

1. phkim
2. 금강방송
3. 변경 내용
   • 서경방송 채널 편집 기능 병합
   • 채널 편집 기능 추가, 기존 검색 방법 변경 (RF,Program number ) -> (major, minor)
   • 채널편집 항목중 추가 -> 시청 으로 문구 변경, 가이드 문구 색상 변경
   • 사용장 키 입력 후 플래시 저장 속도 1초 -> 5초 로 변경
   • UI 동작에 대한 시나리오 통일

File:

• trunk/zasc/app_c/DST_WinChannelEdit.c (modified) (9 diffs)

trunk/zasc/app_c/DST_WinChannelEdit.c

@@ -1 @@
-#if CHANNEL_EDIT_SUPPORT
-
 #include "DST_WinManager.h"
 #include "DST_ChannelTune.h"
@@ -9 +7 @@
 #include "DST_DB.h"
 #include "DST_MemoryDB.h"
+
+#if SUPPORT_CHANNEL_EDIT
 
 #define CE_LIST         5
@@ -85 +85 @@
         }
 
-        void CChannelEditWin_SetValues(int rf, DS_U16 sourceID, bool bAdd)
-        {
-                DST_DB_SetSkipChannel(rf, sourceID, bAdd);
+        void CChannelEditWin_SetValues(int minor, DS_U16 major, bool bAdd)
+        {
+                DST_DB_SetSkipChannel(major, minor, bAdd);
 //              DST_DB_MakeSkipChannel();
         }
         
-        bool CChannelEditWin_CompareValues(int rf, DS_U16 target)
+        bool CChannelEditWin_CompareValues(int minor, DS_U16 major)
         {
                 bool result = false;
@@ -97 +97 @@
                 for( i=0;i<DB_SKIP_LIST_MAX;i++)
                 {
-                        if(db_skip_list[i].rf == rf && db_skip_list[i].program_number == target)
+                        if(db_skip_list[i].minor == minor && db_skip_list[i].major == major)
                                 result = true;
                 }
@@ -154 +154 @@
         {
                 DS_U16  final[20];
-                this->setFontStyle(this, 20,0xFF8C8C8C,this->FontGetVerAlign(this),ALIGN_LEFT);
+                this->setFontStyle(this, 20,0xFFDCDCDC,this->FontGetVerAlign(this),ALIGN_LEFT);
 
                 memset(final,0,sizeof(final));
@@ -195 +195 @@
                 this->DrawImage(this, 417, 43+index*y_Multiplier, newcon2_gui_channeledit_button_check_empty, false);
 
-                if(!CChannelEditWin_CompareValues(CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].rf, CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].number))
+                if(!CChannelEditWin_CompareValues(CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].minor, CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].major))
                         this->DrawImage(this, 417, 43+index*y_Multiplier, newcon2_gui_channeledit_button_check, false);
                 else
@@ -201 +201 @@
                 if(CChannelEditWin_select == index+CChannelEditWin_g_nTop)
                 {
-                        if(!CChannelEditWin_CompareValues(CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].rf,CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].number))
+                        if(!CChannelEditWin_CompareValues(CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].minor,CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].major))
                                 this->DrawImage(this, 417, 43+index*y_Multiplier, newcon2_gui_channeledit_button_check_cursor, false);
                         else
@@ -263 +263 @@
                 {
                         case VK_MENU:
+                                DST_CreateWin(WIN_MAIN_MENU, WIN_NULL, 0, 0, 0, 0);
+                                this->Close(this);
+                                break;
                         case VK_CANCEL:
+                        case VK_PREV_MENU:
+                                this->Close(this);
+                                break;
                         case VK_PREV:
-                        case VK_PREV_MENU:
                         case VK_PREV_CH:
                                 if (this->GetParentWinID(this)) DST_CreateWin(this->GetParentWinID(this), 0, 0, 0, 0, 0);
@@ -290 +295 @@
 //                              break;
                         case VK_OK:
-                                CChannelEditWin_SetValues(CChannelEditWin_chMap[CChannelEditWin_select].rf , CChannelEditWin_chMap[CChannelEditWin_select].number, CChannelEditWin_CompareValues(CChannelEditWin_chMap[CChannelEditWin_select].rf, CChannelEditWin_chMap[CChannelEditWin_select].number)?false:true);
+                                CChannelEditWin_SetValues(CChannelEditWin_chMap[CChannelEditWin_select].minor , CChannelEditWin_chMap[CChannelEditWin_select].major, CChannelEditWin_CompareValues(CChannelEditWin_chMap[CChannelEditWin_select].minor, CChannelEditWin_chMap[CChannelEditWin_select].major)?false:true);
                                 CChannelEditWin_Draw(this);