Changeset 29 in svn
- Timestamp:
- Sep 3, 2015 10:17:59 AM (10 years ago)
- Location:
- trunk/zasc/app_c
- Files:
-
- 14 edited
-
DST_Common.h (modified) (1 diff)
-
DST_DB.c (modified) (8 diffs)
-
DST_GlobalVariables.c (modified) (1 diff)
-
DST_GlobalVariables.h (modified) (1 diff)
-
DST_ISDBT_ChannelTask.c (modified) (1 diff)
-
DST_Main.c (modified) (1 diff)
-
DST_MemoryDB.c (modified) (3 diffs)
-
DST_MemoryDB.h (modified) (4 diffs)
-
DST_UserInterface.c (modified) (1 diff)
-
DST_UserInterface.h (modified) (2 diffs)
-
DST_WinChannelEdit.c (modified) (7 diffs)
-
DST_WinDebugSQL.c (modified) (3 diffs)
-
DST_WinMainMenu.c (modified) (10 diffs)
-
DST_WinManagerTask.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/zasc/app_c/DST_Common.h
r2 r29 58 58 #define MAX_CHANNEL_NUMBER 250 // ÃÖ´ë ä³Î °¹¼ö 59 59 60 #define CHANNEL_EDIT_SUPPORT 0 60 61 61 #define EPG_SUPPORT 0 62 62 #define CVCT_SUPPORT 0 63 #define SUPPORT_CHANNEL_EDIT 1 63 64 64 65 #endif -
trunk/zasc/app_c/DST_DB.c
r4 r29 18 18 //#endif 19 19 20 #if CHANNEL_EDIT_SUPPORT21 void DST_DB_SetSkipChannel(int rf, int program_number, bool bAdd)20 #if SUPPORT_CHANNEL_EDIT 21 void DST_DB_SetSkipChannel(int major, int minor, bool bAdd) 22 22 { 23 23 // CDB db; NewCDB(&db); … … 27 27 for (i=0; i < DB_SKIP_LIST_MAX; i++) 28 28 { 29 if (db_skip_list[i]. program_number == 0) continue;30 if (db_skip_list[i]. rf != rf) continue;31 if (db_skip_list[i]. program_number != program_number) continue;29 if (db_skip_list[i].major == 0) continue; 30 if (db_skip_list[i].minor != minor) continue; 31 if (db_skip_list[i].major != major) continue; 32 32 memset(&db_skip_list[i], 0, sizeof(_DB_SKIP_LIST_)); 33 33 } … … 36 36 for (i=0; i < DB_SKIP_LIST_MAX; i++) 37 37 { 38 if (db_skip_list[i]. program_number != 0) continue;39 db_skip_list[i]. rf = rf;40 db_skip_list[i]. program_number = program_number;38 if (db_skip_list[i].major != 0) continue; 39 db_skip_list[i].minor = minor; 40 db_skip_list[i].major = major; 41 41 break; 42 42 } … … 45 45 // DeleteCDB(&db); 46 46 } 47 #endif // CHANNEL_EDIT_SUPPORT47 #endif // SUPPORT_CHANNEL_EDIT 48 48 49 49 bool DST_DB_PresentChMap() … … 388 388 memset(&db_cvct_sub, 0, sizeof(_DB_CVCT_SUB_)*DB_CVCT_SUB_MAX); 389 389 #endif 390 #if CHANNEL_EDIT_SUPPORT390 #if SUPPORT_CHANNEL_EDIT 391 391 memset(&db_skip_list, 0, sizeof(_DB_SKIP_LIST_)*DB_SKIP_LIST_MAX); 392 #endif // CHANNEL_EDIT_SUPPORT392 #endif // SUPPORT_CHANNEL_EDIT 393 393 CT_ChMapUpdate(); 394 394 DBLock(false); … … 458 458 memcpy(&strFlash[nPos], &db_pmt, sizeof(_DB_PMT_) * DB_PMT_MAX); 459 459 nPos += sizeof(_DB_PMT_) * DB_PMT_MAX; 460 #if CHANNEL_EDIT_SUPPORT461 memcpy(&strFlash[nPos], &db_skip_list, sizeof(_DB_SKIP_LIST_) * DB_SKIP_LIST_MAX);462 nPos += sizeof(_DB_SKIP_LIST_) * DB_SKIP_LIST_MAX;463 #endif // CHANNEL_EDIT_SUPPORT464 460 memcpy(&strFlash[nPos], &db_tvct, sizeof(_DB_TVCT_) * DB_TVCT_MAX); 465 461 nPos += sizeof(_DB_TVCT_) * DB_TVCT_MAX; 466 462 memcpy(&strFlash[nPos], &db_tvct_sub, sizeof(_DB_TVCT_SUB_) * DB_TVCT_SUB_MAX); 467 463 nPos += sizeof(_DB_TVCT_SUB_) * DB_TVCT_SUB_MAX; 464 #if SUPPORT_CHANNEL_EDIT 465 memcpy(&strFlash[nPos], &db_skip_list, sizeof(_DB_SKIP_LIST_) * DB_SKIP_LIST_MAX); 466 nPos += sizeof(_DB_SKIP_LIST_) * DB_SKIP_LIST_MAX; 467 #endif // SUPPORT_CHANNEL_EDIT 468 468 *version = FLASH_VERSION; 469 469 *crc = DST_CRC32(&strFlash[8], g_nFlashDBSize-8); … … 483 483 g_nFlashDBSize += sizeof(_DB_PAT_) * DB_PAT_MAX; 484 484 g_nFlashDBSize += sizeof(_DB_PMT_) * DB_PMT_MAX; 485 #if CHANNEL_EDIT_SUPPORT 485 g_nFlashDBSize += sizeof(_DB_TVCT_) * DB_TVCT_MAX; 486 g_nFlashDBSize += sizeof(_DB_TVCT_SUB_) * DB_TVCT_SUB_MAX; 487 #if SUPPORT_CHANNEL_EDIT 486 488 g_nFlashDBSize += sizeof(_DB_SKIP_LIST_) * DB_SKIP_LIST_MAX; 487 489 #endif 488 g_nFlashDBSize += sizeof(_DB_TVCT_) * DB_TVCT_MAX; 489 g_nFlashDBSize += sizeof(_DB_TVCT_SUB_) * DB_TVCT_SUB_MAX; 490 490 491 // DST_Printf("nFlashDBSize4K = %d nFlashDBSize = %d\n", nFlashDBSize4K, (int)g_nFlashDBSize); 491 492 DS_U32 nFlashDBSize4K = ((g_nFlashDBSize+4096-1)/4096)*4096; … … 522 523 memcpy(&db_pmt, &strFlash[nPos], sizeof(_DB_PMT_) * DB_PMT_MAX); 523 524 nPos += sizeof(_DB_PMT_) * DB_PMT_MAX; 524 #if CHANNEL_EDIT_SUPPORT525 memcpy(&db_skip_list, &strFlash[nPos], sizeof(_DB_SKIP_LIST_) * DB_SKIP_LIST_MAX);526 nPos += sizeof(_DB_SKIP_LIST_) * DB_SKIP_LIST_MAX;527 #endif528 525 memcpy( &db_tvct, &strFlash[nPos], sizeof(_DB_TVCT_) * DB_TVCT_MAX); 529 526 nPos += sizeof(_DB_TVCT_) * DB_TVCT_MAX; 530 527 memcpy(&db_tvct_sub, &strFlash[nPos], sizeof(_DB_TVCT_SUB_) * DB_TVCT_SUB_MAX); 531 528 nPos += sizeof(_DB_TVCT_SUB_) * DB_TVCT_SUB_MAX; 529 #if SUPPORT_CHANNEL_EDIT 530 memcpy(&db_skip_list, &strFlash[nPos], sizeof(_DB_SKIP_LIST_) * DB_SKIP_LIST_MAX); 531 nPos += sizeof(_DB_SKIP_LIST_) * DB_SKIP_LIST_MAX; 532 #endif 532 533 int i; 533 534 for (i = 0; i < DB_CONFIG_MAX; i++) -
trunk/zasc/app_c/DST_GlobalVariables.c
r2 r29 1 1 #include "DST_GlobalVariables.h" 2 3 #if SUPPORT_CHANNEL_EDIT 4 DS_U32 DST_g_ChannelEdit = 0; 5 #endif 2 6 3 7 bool DST_g_isAirOnly = 0; -
trunk/zasc/app_c/DST_GlobalVariables.h
r2 r29 3 3 4 4 #include "DST_Common.h" 5 6 #if SUPPORT_CHANNEL_EDIT 7 extern DS_U32 DST_g_ChannelEdit; // ¸Þ´º¿¡¼ ä³Î ÆíÁý ±â´É ¿©ºÎ¸¦ ÆÇ´ÜÇϱâ À§ÇÔ 8 #endif 5 9 6 10 extern bool DST_g_isAirOnly; -
trunk/zasc/app_c/DST_ISDBT_ChannelTask.c
r14 r29 742 742 { 743 743 if (db_channel_db[i].program_number == 0) continue; 744 #if CHANNEL_EDIT_SUPPORT744 #if SUPPORT_CHANNEL_EDIT 745 745 bool bSkip = false; 746 746 for (j=0; j < DB_SKIP_LIST_MAX; j++) 747 747 { 748 if (db_skip_list[j]. program_number == 0) continue;749 if (db_skip_list[j]. rf != db_channel_db[i].rf) continue;750 if (db_skip_list[j]. program_number != db_channel_db[i].program_number) continue;748 if (db_skip_list[j].major == 0) continue; 749 if (db_skip_list[j].minor != db_channel_db[i].minor) continue; 750 if (db_skip_list[j].major != db_channel_db[i].major) continue; 751 751 bSkip = true; 752 752 break; -
trunk/zasc/app_c/DST_Main.c
r28 r29 100 100 DST_CCManagerInit(); 101 101 DST_UI_SetVolume(DST_EEPROM_GetVolume()); 102 #if SUPPORT_CHANNEL_EDIT 103 DST_UI_SetChannelEditEnable(1); 104 #endif 102 105 while (1) 103 106 { -
trunk/zasc/app_c/DST_MemoryDB.c
r2 r29 10 10 #endif 11 11 12 #if CHANNEL_EDIT_SUPPORT12 #if SUPPORT_CHANNEL_EDIT 13 13 struct DB_SKIP_LIST db_skip_list[DB_SKIP_LIST_MAX]; 14 14 #endif … … 41 41 { NO_ETT , "ett"}, 42 42 #endif 43 #if CHANNEL_EDIT_SUPPORT44 { NO_SKIP_LIST , "skip_list"},45 #endif46 43 #if CVCT_SUPPORT 47 44 { NO_CVCT , "cvct"}, … … 50 47 { NO_TVCT , "tvct"}, 51 48 { NO_TVCT_SUB , "tvct_sub"}, 49 #if SUPPORT_CHANNEL_EDIT 50 { NO_SKIP_LIST , "skip_list"}, 51 #endif 52 52 { NO_CONFIG , "config"}, 53 53 { NO_CHANNEL_DB , "channel_db"}, -
trunk/zasc/app_c/DST_MemoryDB.h
r2 r29 15 15 NO_ETT, 16 16 #endif 17 #if CHANNEL_EDIT_SUPPORT18 NO_SKIP_LIST,19 #endif20 17 #if CVCT_SUPPORT 21 18 NO_CVCT, … … 24 21 NO_TVCT, 25 22 NO_TVCT_SUB, 23 #if SUPPORT_CHANNEL_EDIT 24 NO_SKIP_LIST, 25 #endif 26 26 NO_CONFIG, 27 27 NO_CHANNEL_DB, … … 128 128 #endif // EPG_SUPPORT 129 129 130 #if CHANNEL_EDIT_SUPPORT130 #if SUPPORT_CHANNEL_EDIT 131 131 ////////////////////////// SKIP_LIST /////////////////////////////// 132 132 #define DB_SKIP_LIST_MAX MAX_CHANNEL_NUMBER // Àüü ä³Î °¹¼ö … … 134 134 typedef struct DB_SKIP_LIST 135 135 { 136 int rf;137 int program_number;136 int major; 137 int minor; 138 138 }_DB_SKIP_LIST_; 139 139 -
trunk/zasc/app_c/DST_UserInterface.c
r2 r29 152 152 } 153 153 154 #if SUPPORT_CHANNEL_EDIT 155 void DST_UI_SetChannelEditEnable(DS_U32 ienable) 156 { 157 DST_g_ChannelEdit = ienable; 158 } 159 #endif 154 160 #if 0 155 161 ____EPG_UI___() -
trunk/zasc/app_c/DST_UserInterface.h
r2 r29 25 25 MN_AV_DISPLAY_MODE, 26 26 MN_AV_AUDIO_PREF, 27 #if SUPPORT_CHANNEL_EDIT 28 MN_CHANNEL_EDIT, 29 #endif 27 30 MN_AV_VI, 28 31 MN_CC_DISPLAY, … … 126 129 bool DST_UI_GetCCInfo(void); 127 130 131 #if SUPPORT_CHANNEL_EDIT 132 // ÇöÀç ä³Î ÆíÁý ¸ðµå È®ÀÎ 133 void DST_UI_SetChannelEditEnable(DS_U32 ienable); 134 135 #endif 136 128 137 #if 0 129 138 ____EPG_UI___() -
trunk/zasc/app_c/DST_WinChannelEdit.c
r2 r29 1 #if CHANNEL_EDIT_SUPPORT2 3 1 #include "DST_WinManager.h" 4 2 #include "DST_ChannelTune.h" … … 9 7 #include "DST_DB.h" 10 8 #include "DST_MemoryDB.h" 9 10 #if SUPPORT_CHANNEL_EDIT 11 11 12 12 #define CE_LIST 5 … … 85 85 } 86 86 87 void CChannelEditWin_SetValues(int rf, DS_U16 sourceID, bool bAdd)88 { 89 DST_DB_SetSkipChannel( rf, sourceID, bAdd);87 void CChannelEditWin_SetValues(int minor, DS_U16 major, bool bAdd) 88 { 89 DST_DB_SetSkipChannel(major, minor, bAdd); 90 90 // DST_DB_MakeSkipChannel(); 91 91 } 92 92 93 bool CChannelEditWin_CompareValues(int rf, DS_U16 target)93 bool CChannelEditWin_CompareValues(int minor, DS_U16 major) 94 94 { 95 95 bool result = false; … … 97 97 for( i=0;i<DB_SKIP_LIST_MAX;i++) 98 98 { 99 if(db_skip_list[i]. rf == rf && db_skip_list[i].program_number == target)99 if(db_skip_list[i].minor == minor && db_skip_list[i].major == major) 100 100 result = true; 101 101 } … … 195 195 this->DrawImage(this, 417, 43+index*y_Multiplier, newcon2_gui_channeledit_button_check_empty, false); 196 196 197 if(!CChannelEditWin_CompareValues(CChannelEditWin_chMap[index+CChannelEditWin_g_nTop]. rf, CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].number))197 if(!CChannelEditWin_CompareValues(CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].minor, CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].major)) 198 198 this->DrawImage(this, 417, 43+index*y_Multiplier, newcon2_gui_channeledit_button_check, false); 199 199 else … … 201 201 if(CChannelEditWin_select == index+CChannelEditWin_g_nTop) 202 202 { 203 if(!CChannelEditWin_CompareValues(CChannelEditWin_chMap[index+CChannelEditWin_g_nTop]. rf,CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].number))203 if(!CChannelEditWin_CompareValues(CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].minor,CChannelEditWin_chMap[index+CChannelEditWin_g_nTop].major)) 204 204 this->DrawImage(this, 417, 43+index*y_Multiplier, newcon2_gui_channeledit_button_check_cursor, false); 205 205 else … … 290 290 // break; 291 291 case VK_OK: 292 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);292 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); 293 293 CChannelEditWin_Draw(this); 294 294 -
trunk/zasc/app_c/DST_WinDebugSQL.c
r2 r29 609 609 break; 610 610 #endif 611 #if CHANNEL_EDIT_SUPPORT611 #if SUPPORT_CHANNEL_EDIT 612 612 case NO_SKIP_LIST: 613 613 CDebugSQLSubWin_RowItemNum = 0; 614 614 for(i = 0; i< DB_SKIP_LIST_MAX ; i++) 615 615 { 616 if(db_skip_list[i]. rf == 0 && db_skip_list[i].program_number == 0 ) continue;616 if(db_skip_list[i].minor == 0 && db_skip_list[i].major == 0 ) continue; 617 617 CDebugSQLSubWin_RowItemNum++; 618 618 } … … 621 621 CDebugSQLSubWin_attributes = (ATTRIBUTES *)DST_OS_Calloc(sizeof(ATTRIBUTES), CDebugSQLSubWin_ColItemNum); 622 622 623 CDebugSQLSubWin_attributes[0].name = (char *)" rf";623 CDebugSQLSubWin_attributes[0].name = (char *)"Minor"; 624 624 CDebugSQLSubWin_attributes[0].type = 1; 625 CDebugSQLSubWin_attributes[1].name = (char *)" program_number";625 CDebugSQLSubWin_attributes[1].name = (char *)"Major"; 626 626 CDebugSQLSubWin_attributes[1].type = 1; 627 627 … … 635 635 switch(j) 636 636 { 637 case 0: sprintf(tmp_str,"%d",db_skip_list[i]. rf); break;638 case 1: sprintf(tmp_str,"%d",db_skip_list[i]. program_number); break;637 case 0: sprintf(tmp_str,"%d",db_skip_list[i].minor); break; 638 case 1: sprintf(tmp_str,"%d",db_skip_list[i].major); break; 639 639 default: break; 640 640 -
trunk/zasc/app_c/DST_WinMainMenu.c
r28 r29 24 24 { MN_AV_DISPLAY_MODE, true }, 25 25 { MN_AV_AUDIO_PREF, true }, 26 #if SUPPORT_CHANNEL_EDIT 27 { MN_CHANNEL_EDIT, true }, 28 #endif 26 29 { MN_AV_VI, true }, 27 30 { MN_CC_DISPLAY, true }, … … 60 63 void CMainMenu_GetValuse(DS_U16 menu, DS_U16 *value); 61 64 65 #if SUPPORT_CHANNEL_EDIT 66 void CMainMenu_ChannelEdit_Change_Enable(); 67 #endif 68 62 69 //public: 63 70 // CZASMainMenu(SWinEventMsg event):CWindow(event) … … 121 128 case MN_AV_DISPLAY_MODE: return CMainMenu_getAspectRatioIndex(); 122 129 case MN_AV_AUDIO_PREF: return 2; 130 #if SUPPORT_CHANNEL_EDIT 131 case MN_CHANNEL_EDIT: return 1; 132 #endif 123 133 case MN_AV_VI: return 2; 124 134 case MN_CC_DISPLAY: return 2; … … 154 164 } 155 165 166 #if SUPPORT_CHANNEL_EDIT 167 void CMainMenu_ChannelEdit_Change_Enable() 168 { 169 int i = 0; 170 for (i = 0; i < MN_MAX_NUM; i++) 171 { 172 if (CMainMenu_tv_menu[i].menu == MN_CHANNEL_EDIT) 173 { 174 CMainMenu_tv_menu[i].bEnable = DST_g_ChannelEdit; 175 break; 176 } 177 } 178 } 179 #endif 180 181 156 182 void CMainMenu_InitValues() 157 183 { 158 184 CMainMenu_MenuIdx = 0;/*DST_UI_GetSource();*/ 159 185 186 #if SUPPORT_CHANNEL_EDIT 187 CMainMenu_ChannelEdit_Change_Enable(); 188 #endif 189 160 190 CMainMenu_mainItemNum = CMainMenu_GetCount(); 161 191 CMainMenu_g_nTop = MenuTop[CMainMenu_MenuIdx]; … … 189 219 case MN_AV_DISPLAY_MODE: *value = DST_UI_GetAspect(); break; 190 220 case MN_AV_AUDIO_PREF: *value = DST_UI_GetMTS(); break; 221 #if SUPPORT_CHANNEL_EDIT 222 case MN_CHANNEL_EDIT: *value = 0; break; 223 #endif 191 224 case MN_AV_VI: *value = DST_UI_GetVI(); break; 192 225 case MN_CC_DISPLAY: *value = DST_EEPROM_GetCC(); break; … … 208 241 case MN_AV_DISPLAY_MODE: DST_UI_SetAspect(value); break; 209 242 case MN_AV_AUDIO_PREF: DST_UI_SetMTS(value); break; 243 #if SUPPORT_CHANNEL_EDIT 244 case MN_CHANNEL_EDIT: break; 245 #endif 210 246 case MN_AV_VI: DST_UI_SetVI(value); break; 211 247 case MN_CC_DISPLAY: DST_UI_SetCloseCaption(value); break; … … 232 268 case MN_AV_DISPLAY_MODE: return pz_Sub_DisplayMode[OSD_Lang]; break; 233 269 case MN_AV_AUDIO_PREF: return pz_Sub_AudioPref[OSD_Lang]; break; 270 #if SUPPORT_CHANNEL_EDIT 271 case MN_CHANNEL_EDIT: return pz_Sub_ChannelEdit_E1[OSD_Lang]; break; 272 #endif 234 273 case MN_AV_VI: return pz_Sub_DVS[OSD_Lang]; break; 235 274 case MN_CC_DISPLAY: return pz_Sub_CC[OSD_Lang]; break; … … 321 360 case MN_FACTORY_RESET: 322 361 case MN_STB_INFO: 362 #if SUPPORT_CHANNEL_EDIT 363 case MN_CHANNEL_EDIT: 364 #endif 323 365 switch (nPos) 324 366 { … … 474 516 case MN_FACTORY_RESET: 475 517 case MN_STB_INFO: 518 #if SUPPORT_CHANNEL_EDIT 519 case MN_CHANNEL_EDIT: 520 #endif 476 521 break; 477 522 default: … … 557 602 DST_CreateWin(WIN_STB_INFO, WIN_NULL, 0, 0, 0, 0); 558 603 break; 604 #if SUPPORT_CHANNEL_EDIT 605 case MN_CHANNEL_EDIT: 606 DST_CreateWin(WIN_CHANNEL_LIST, WIN_NULL, 0, 0, 0, 0); 607 break; 608 #endif 609 559 610 default: 560 611 break; -
trunk/zasc/app_c/DST_WinManagerTask.c
r2 r29 19 19 void DST_CreateSignalMeterWin(SWinEventMsg event); 20 20 21 #if CHANNEL_EDIT_SUPPORT21 #if SUPPORT_CHANNEL_EDIT 22 22 void DST_CreateChannelEditWin(SWinEventMsg event); 23 23 #endif … … 175 175 #endif 176 176 177 #if CHANNEL_EDIT_SUPPORT177 #if SUPPORT_CHANNEL_EDIT 178 178 case WIN_CHANNEL_LIST: 179 179 DST_CreateChannelEditWin(event); // C ¾ð¾î Æ÷ÆÃ ÇÊ¿ä
Note: See TracChangeset
for help on using the changeset viewer.
