diff --git a/doc/html/changelog.html b/doc/html/changelog.html index f7061fb79bb2ed893d29eb80cfc04998fd4c3a5e..22947d5b68763629b6280e554cecddd65beaf76a 100644 --- a/doc/html/changelog.html +++ b/doc/html/changelog.html @@ -110,6 +110,18 @@
  • Added shorthand operation --remove-replay-gain for removing ReplayGain tags.
  • --export-cuesheet-to now properly specifies the FLAC file name (SF #1272825).
  • Importing of non-CDDA-compliant cuesheets now issues a warning.
    • +
  • Removed the following deprecated tag editing options; you should use the new option names shown instead: + +
  • diff --git a/include/FLAC/stream_encoder.h b/include/FLAC/stream_encoder.h index 20d73755d4e1ee546d5c4626aa336f8e51e0f4b2..6ccd2638a73d9f62f9535da4f7816a3edcc94b33 100644 --- a/include/FLAC/stream_encoder.h +++ b/include/FLAC/stream_encoder.h @@ -295,9 +295,6 @@ typedef enum { FLAC__STREAM_ENCODER_INIT_STATUS_MID_SIDE_CHANNELS_MISMATCH, /**< Mid/side coding was specified but the number of channels is not equal to 2. */ - FLAC__STREAM_ENCODER_INIT_STATUS_MID_SIDE_SAMPLE_SIZE_MISMATCH, - /**< Deprecated. */ - FLAC__STREAM_ENCODER_INIT_STATUS_ILLEGAL_MID_SIDE_FORCE, /**< Loose mid/side coding was specified but mid/side coding was not. */ diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c index 6cc7f5b5684dc6203435914b236752d70350f29d..50d792f0c17c0e9ababe8bf795f680b26458a00f 100644 --- a/src/libFLAC/stream_encoder.c +++ b/src/libFLAC/stream_encoder.c @@ -489,7 +489,6 @@ FLAC_API const char * const FLAC__StreamEncoderInitStatusString[] = { "FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_MAX_LPC_ORDER", "FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_QLP_COEFF_PRECISION", "FLAC__STREAM_ENCODER_INIT_STATUS_MID_SIDE_CHANNELS_MISMATCH", - "FLAC__STREAM_ENCODER_INIT_STATUS_MID_SIDE_SAMPLE_SIZE_MISMATCH", "FLAC__STREAM_ENCODER_INIT_STATUS_ILLEGAL_MID_SIDE_FORCE", "FLAC__STREAM_ENCODER_INIT_STATUS_BLOCK_SIZE_TOO_SMALL_FOR_LPC_ORDER", "FLAC__STREAM_ENCODER_INIT_STATUS_NOT_STREAMABLE", diff --git a/src/metaflac/options.c b/src/metaflac/options.c index d24fbecc27a19290e83dd1409b1cf076d5c0cb5a..6d42599871b7ac48de1a8906a6c2168478bfde9e 100644 --- a/src/metaflac/options.c +++ b/src/metaflac/options.c @@ -70,14 +70,6 @@ struct share__option long_options_[] = { { "set-tag-from-file", 1, 0, 0 }, { "import-tags-from", 1, 0, 0 }, { "export-tags-to", 1, 0, 0 }, - { "show-vc-vendor", 0, 0, 0 }, /* deprecated */ - { "show-vc-field", 1, 0, 0 }, /* deprecated */ - { "remove-vc-all", 0, 0, 0 }, /* deprecated */ - { "remove-vc-field", 1, 0, 0 }, /* deprecated */ - { "remove-vc-firstfield", 1, 0, 0 }, /* deprecated */ - { "set-vc-field", 1, 0, 0 }, /* deprecated */ - { "import-vc-from", 1, 0, 0 }, /* deprecated */ - { "export-vc-to", 1, 0, 0 }, /* deprecated */ { "import-cuesheet-from", 1, 0, 0 }, { "export-cuesheet-to", 1, 0, 0 }, { "import-picture", 1, 0, 0 }, @@ -461,15 +453,11 @@ FLAC__bool parse_option(int option_index, const char *option_argument, CommandLi else undocumented_warning(opt); } - else if(0 == strcmp(opt, "show-vendor-tag") || 0 == strcmp(opt, "show-vc-vendor")) { - if(0 == strcmp(opt, "show-vc-vendor")) - fprintf(stderr, "WARNING: --%s is deprecated, the new name is --show-vendor-tag\n", opt); + else if(0 == strcmp(opt, "show-vendor-tag")) { (void) append_shorthand_operation(options, OP__SHOW_VC_VENDOR); } - else if(0 == strcmp(opt, "show-tag") || 0 == strcmp(opt, "show-vc-field")) { + else if(0 == strcmp(opt, "show-tag")) { const char *violation; - if(0 == strcmp(opt, "show-vc-field")) - fprintf(stderr, "WARNING: --%s is deprecated, the new name is --show-tag\n", opt); op = append_shorthand_operation(options, OP__SHOW_VC_FIELD); FLAC__ASSERT(0 != option_argument); if(!parse_vorbis_comment_field_name(option_argument, &(op->argument.vc_field_name.value), &violation)) { @@ -478,15 +466,11 @@ FLAC__bool parse_option(int option_index, const char *option_argument, CommandLi ok = false; } } - else if(0 == strcmp(opt, "remove-all-tags") || 0 == strcmp(opt, "remove-vc-all")) { - if(0 == strcmp(opt, "remove-vc-all")) - fprintf(stderr, "WARNING: --%s is deprecated, the new name is --remove-all-tags\n", opt); + else if(0 == strcmp(opt, "remove-all-tags")) { (void) append_shorthand_operation(options, OP__REMOVE_VC_ALL); } - else if(0 == strcmp(opt, "remove-tag") || 0 == strcmp(opt, "remove-vc-field")) { + else if(0 == strcmp(opt, "remove-tag")) { const char *violation; - if(0 == strcmp(opt, "remove-vc-field")) - fprintf(stderr, "WARNING: --%s is deprecated, the new name is --remove-tag\n", opt); op = append_shorthand_operation(options, OP__REMOVE_VC_FIELD); FLAC__ASSERT(0 != option_argument); if(!parse_vorbis_comment_field_name(option_argument, &(op->argument.vc_field_name.value), &violation)) { @@ -495,10 +479,8 @@ FLAC__bool parse_option(int option_index, const char *option_argument, CommandLi ok = false; } } - else if(0 == strcmp(opt, "remove-first-tag") || 0 == strcmp(opt, "remove-vc-firstfield")) { + else if(0 == strcmp(opt, "remove-first-tag")) { const char *violation; - if(0 == strcmp(opt, "remove-vc-firstfield")) - fprintf(stderr, "WARNING: --%s is deprecated, the new name is --remove-first-tag\n", opt); op = append_shorthand_operation(options, OP__REMOVE_VC_FIRSTFIELD); FLAC__ASSERT(0 != option_argument); if(!parse_vorbis_comment_field_name(option_argument, &(op->argument.vc_field_name.value), &violation)) { @@ -507,10 +489,8 @@ FLAC__bool parse_option(int option_index, const char *option_argument, CommandLi ok = false; } } - else if(0 == strcmp(opt, "set-tag") || 0 == strcmp(opt, "set-vc-field")) { + else if(0 == strcmp(opt, "set-tag")) { const char *violation; - if(0 == strcmp(opt, "set-vc-field")) - fprintf(stderr, "WARNING: --%s is deprecated, the new name is --set-tag\n", opt); op = append_shorthand_operation(options, OP__SET_VC_FIELD); FLAC__ASSERT(0 != option_argument); op->argument.vc_field.field_value_from_file = false; @@ -531,9 +511,7 @@ FLAC__bool parse_option(int option_index, const char *option_argument, CommandLi ok = false; } } - else if(0 == strcmp(opt, "import-tags-from") || 0 == strcmp(opt, "import-vc-from")) { - if(0 == strcmp(opt, "import-vc-from")) - fprintf(stderr, "WARNING: --%s is deprecated, the new name is --import-tags-from\n", opt); + else if(0 == strcmp(opt, "import-tags-from")) { op = append_shorthand_operation(options, OP__IMPORT_VC_FROM); FLAC__ASSERT(0 != option_argument); if(!parse_string(option_argument, &(op->argument.filename.value))) { @@ -541,9 +519,7 @@ FLAC__bool parse_option(int option_index, const char *option_argument, CommandLi ok = false; } } - else if(0 == strcmp(opt, "export-tags-to") || 0 == strcmp(opt, "export-vc-to")) { - if(0 == strcmp(opt, "export-vc-to")) - fprintf(stderr, "WARNING: --%s is deprecated, the new name is --export-tags-to\n", opt); + else if(0 == strcmp(opt, "export-tags-to")) { op = append_shorthand_operation(options, OP__EXPORT_VC_TO); FLAC__ASSERT(0 != option_argument); if(!parse_string(option_argument, &(op->argument.filename.value))) {