X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=epgdump%2Fsdt.c;h=6192f6bf2f8c1c65f3934ce994c6b450f49c14e9;hb=0ec9fc28a6058c5a574fb4a7196b758954c05492;hp=0f8d12ace2da2546dbc2752c87af37387291d777;hpb=4500bdc373a7e8920d8aebb8095a7d5d549e2094;p=rec10%2Frec10-git.git

diff --git a/epgdump/sdt.c b/epgdump/sdt.c
index 0f8d12a..6192f6b 100755
--- a/epgdump/sdt.c
+++ b/epgdump/sdt.c
@@ -176,10 +176,18 @@ void dumpSDT(unsigned char *ptr, SVT_CONTROL *top,STATION **station, int * stati
 					logd.logo_version, logd.download_data_id);
 				#endif
 
+				/*
+					logd.logo_transmission_type
+					0x01 CDT 伝送方式1:CDT をダウンロードデータ識別で直接参照する場合
+					0x02 CDT 伝送方式2:CDT をロゴ識別を用いてダウンロードデータ識別を間接的に参照する場合
+					0x03 簡易ロゴ方式
+				*/
 				if ( logd.logo_transmission_type != 0x01 ) continue;
 				for (i=0; i<stationi; i++) {
+					// FIXME: pStation[i].logo_version < logd.logo_version
 					if ( pStation[i].svId == sdtb.service_id ) {
 						pStation[i].logo_download_data_id = logd.download_data_id;
+						pStation[i].logo_version = logd.logo_version;
 					}
 				}
 
@@ -215,12 +223,13 @@ void dumpSDT(unsigned char *ptr, SVT_CONTROL *top,STATION **station, int * stati
 					}
 
 					pStation = realloc(pStation, (stationi + 1) * sizeof(STATION));
+					memset(&pStation[stationi], 0, sizeof(STATION));
+
 					pStation[stationi].name = malloc( strlen(desc.service_name) + 1 );
 					pStation[stationi].ontv = malloc( strlen(sid) + 1 );
 					pStation[stationi].tsId = sdth.transport_stream_id;
 					pStation[stationi].onId = sdth.original_network_id;
 					pStation[stationi].svId = sdtb.service_id;
-					memset(pStation[stationi].logo_array, 0, sizeof(pStation[stationi].logo_array));
 
 					strcpy(pStation[stationi].name, desc.service_name);
 					strcpy(pStation[stationi].ontv, sid);