diff -C2 -N -r bcast-2000c/ChangeLog bcast-2000c-mf1/ChangeLog *** bcast-2000c/ChangeLog Thu Jan 1 01:00:00 1970 --- bcast-2000c-mf1/ChangeLog Tue Oct 16 14:52:52 2001 *************** *** 0 **** --- 1,11 ---- + 2001-10-16 Moritz Franosch + + * Makefile (clean): 'make clean' works. + + * pluginpack/filehtal.C (read_tag): Quoted ("") encodings in + recording scripts are read correctly. + + * bcast/patch.C (Patch): Enable drawing of tracks by default. + + * bcast/file.C (strtocompression): Error message 'Unrecognized video + compression' printed. diff -C2 -N -r bcast-2000c/Makefile bcast-2000c-mf1/Makefile *** bcast-2000c/Makefile Mon Jan 22 21:55:45 2001 --- bcast-2000c-mf1/Makefile Tue Oct 16 14:52:19 2001 *************** *** 1,4 **** --- 1,7 ---- #### THE MASTER MAKEFILE + # changed 2001-10-16 by Moritz Franosch + + DIRS = libmpeg3 \ tiff \ *************** *** 41,45 **** clean: rm -f *.o ipcclear soundtest - make -C cinelerra clean make -C plugins clean @ for i in $(DIRS) ; \ --- 44,47 ---- diff -C2 -N -r bcast-2000c/bcast/file.C bcast-2000c-mf1/bcast/file.C *** bcast-2000c/bcast/file.C Mon Jan 22 21:55:45 2001 --- bcast-2000c-mf1/bcast/file.C Tue Oct 16 14:18:09 2001 *************** *** 1,2 **** --- 1,5 ---- + // changed 2001-10-16 by Moritz Franosch + + #include #include "assets.h" *************** *** 782,785 **** --- 785,789 ---- if(!strcmp(string, QTJPEG_NAME)) return QUICKTIME_JPEG; if(!strcmp(string, MJPA_NAME)) return QUICKTIME_MJPA; + printf("Unrecognized video compression: '%s'. Defaulting to '%s'.\n",string,RGB_NAME); return QUICKTIME_RAW; } diff -C2 -N -r bcast-2000c/bcast/patch.C bcast-2000c-mf1/bcast/patch.C *** bcast-2000c/bcast/patch.C Mon Jan 22 21:55:45 2001 --- bcast-2000c-mf1/bcast/patch.C Tue Oct 16 14:49:36 2001 *************** *** 1,2 **** --- 1,5 ---- + // changed 2001-10-16 by Moritz Franosch + + #include #include "console.h" *************** *** 14,18 **** this->data_type = data_type; record = play = automate = 1; ! draw = 0; title[0] = 0; } --- 17,21 ---- this->data_type = data_type; record = play = automate = 1; ! draw = 1; title[0] = 0; } diff -C2 -N -r bcast-2000c/pluginpack/filehtal.C bcast-2000c-mf1/pluginpack/filehtal.C *** bcast-2000c/pluginpack/filehtal.C Mon Jan 22 21:55:46 2001 --- bcast-2000c-mf1/pluginpack/filehtal.C Tue Oct 16 14:45:59 2001 *************** *** 1,2 **** --- 1,5 ---- + // changed 2001-10-16 by Moritz Franosch + + #include #include *************** *** 364,368 **** } tag_title[i] = 0; ! if(position >= length) return 1; --- 367,371 ---- } tag_title[i] = 0; ! if(position >= length) return 1; *************** *** 388,391 **** --- 391,402 ---- position++; + // find the terminating char + if(position < length && input[position] == '\"') + { + terminating_char = '\"'; // use quotes to terminate + if(position < length) position++; // don't store the quote itself + } + else terminating_char = ' '; // use space to terminate + // read the property description for(j = 0; *************** *** 393,397 **** position < length && input[position] != right_delimiter && ! input[position] != ' ' && input[position] != '='; j++, position++) --- 404,408 ---- position < length && input[position] != right_delimiter && ! input[position] != terminating_char && input[position] != '='; j++, position++) *************** *** 400,404 **** } string[j] = 0; - // store the description in a property array --- 411,414 ----