claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove ancient deprecated things

Browse Source
This commit is contained in:
Josh Coalson
2006-09-26 01:25:52 +00:00
parent 16b570f7d4
commit 2e29c93ac3
4 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doc/html/changelog.html
View File

@@ -110,6 +110,18 @@
<li>Added shorthand operation <a href="documentation.html#metaflac_shorthand_remove_replay_gain"><span class="argument">--remove-replay-gain</span></a> for removing ReplayGain tags.</li>
<li><a href="documentation.html#metaflac_shorthand_export_cuesheet_to"><span class="argument">--export-cuesheet-to</span></a> now properly specifies the FLAC file name (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1272825&amp;group_id=13478&amp;atid=363478">SF #1272825</a>).</li>
<li>Importing of non-CDDA-compliant cuesheets now issues a warning.</li>
<li>Removed the following deprecated tag editing options; you should use the new option names shown instead:
<ul>
<li>Removed <span class="argument">--show-vc-vendor</span>; use <span class="argument">--show-vendor-tag</span></li>
<li>Removed <span class="argument">--show-vc-field</span>; use <span class="argument">--show-tag</span></li>
<li>Removed <span class="argument">--remove-vc-all</span>; use <span class="argument">--remove-all-tags</span></li>
<li>Removed <span class="argument">--remove-vc-field</span>; use <span class="argument">--remove-tag</span></li>
<li>Removed <span class="argument">--remove-vc-firstfield</span>; use <span class="argument">--remove-first-tag</span></li>
<li>Removed <span class="argument">--set-vc-field</span>; use <span class="argument">--set-tag</span></li>
<li>Removed <span class="argument">--import-vc-from</span>; use <span class="argument">--import-tags-from</span></li>
<li>Removed <span class="argument">--export-vc-to</span>; use <span class="argument">--export-tags-to</span></li>
</ul>
</li>
</ul>
</li>
<li>

3
include/FLAC/stream_encoder.h
View File

@@ -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. */

1
src/libFLAC/stream_encoder.c
View File

@@ -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",

40
src/metaflac/options.c
View File

@@ -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))) {