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

rename metaflac's --import-picture to --import-picture-from for consistency with other options

Browse Source
This commit is contained in:
Josh Coalson
2006-11-02 04:06:56 +00:00
parent 989f26701d
commit aec8bb3435
9 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/metaflac/operations.c
View File

@@ -359,7 +359,7 @@ FLAC__bool do_shorthand_operation(const char *filename, FLAC__bool prefix_with_f
case OP__EXPORT_CUESHEET_TO:
ok = do_shorthand_operation__cuesheet(filename, chain, operation, needs_write);
break;
case OP__IMPORT_PICTURE:
case OP__IMPORT_PICTURE_FROM:
case OP__EXPORT_PICTURE_TO:
ok = do_shorthand_operation__picture(filename, chain, operation, needs_write);
break;

2
src/metaflac/operations_shorthand_picture.c
View File

@@ -42,7 +42,7 @@ FLAC__bool do_shorthand_operation__picture(const char *filename, FLAC__Metadata_
FLAC__metadata_iterator_init(iterator, chain);
switch(operation->type) {
case OP__IMPORT_PICTURE:
case OP__IMPORT_PICTURE_FROM:
ok = import_pic_from(filename, &picture, operation->argument.specification.value, needs_write);
if(ok) {
/* append PICTURE block */

8
src/metaflac/options.c
View File

@@ -72,7 +72,7 @@ struct share__option long_options_[] = {
{ "export-tags-to", 1, 0, 0 },
{ "import-cuesheet-from", 1, 0, 0 },
{ "export-cuesheet-to", 1, 0, 0 },
{ "import-picture", 1, 0, 0 },
{ "import-picture-from", 1, 0, 0 },
{ "export-picture-to", 1, 0, 0 },
{ "add-seekpoint", 1, 0, 0 },
{ "add-replay-gain", 0, 0, 0 },
@@ -275,7 +275,7 @@ void free_options(CommandLineOptions *options)
if(0 != op->argument.import_cuesheet_from.filename)
free(op->argument.import_cuesheet_from.filename);
break;
case OP__IMPORT_PICTURE:
case OP__IMPORT_PICTURE_FROM:
if(0 != op->argument.specification.value)
free(op->argument.specification.value);
break;
@@ -559,8 +559,8 @@ FLAC__bool parse_option(int option_index, const char *option_argument, CommandLi
ok = false;
}
}
else if(0 == strcmp(opt, "import-picture")) {
op = append_shorthand_operation(options, OP__IMPORT_PICTURE);
else if(0 == strcmp(opt, "import-picture-from")) {
op = append_shorthand_operation(options, OP__IMPORT_PICTURE_FROM);
FLAC__ASSERT(0 != option_argument);
if(!parse_string(option_argument, &(op->argument.specification.value))) {
fprintf(stderr, "ERROR (--%s): missing specification\n", opt);

2
src/metaflac/options.h
View File

@@ -60,7 +60,7 @@ typedef enum {
OP__EXPORT_VC_TO,
OP__IMPORT_CUESHEET_FROM,
OP__EXPORT_CUESHEET_TO,
OP__IMPORT_PICTURE,
OP__IMPORT_PICTURE_FROM,
OP__EXPORT_PICTURE_TO,
OP__ADD_SEEKPOINT,
OP__ADD_REPLAY_GAIN,

8
src/metaflac/usage.c
View File

@@ -149,10 +149,10 @@ int long_usage(const char *message, ...)
fprintf(out, "--export-cuesheet-to=FILE Export CUESHEET block to a cuesheet file, suitable\n");
fprintf(out, " for use by CD authoring software. Use '-' for stdout.\n");
fprintf(out, " Only one FLAC file may be specified on the command line.\n");
fprintf(out, "--import-picture=SPECIFICATION Import a picture and store it in a PICTURE block.\n");
fprintf(out, " The SPECIFICATION is a string whose parts are separated\n");
fprintf(out, " by | characters. Some parts may be left empty to invoke\n");
fprintf(out, " default values. The specification format is:\n");
fprintf(out, "--import-picture-from=SPECIFICATION Import a picture and store it in a PICTURE\n");
fprintf(out, " block. The SPECIFICATION is a string whose parts are\n");
fprintf(out, " separated by | characters. Some parts may be left empty\n");
fprintf(out, " to invoke default values. The specification format is:\n");
fprintf(out, " [TYPE]|MIME-TYPE|[DESCRIPTION]|[WIDTHxHEIGHTxDEPTH[/COLORS]]|FILE\n");
fprintf(out, " TYPE is optional; it is a number from one of:\n");
fprintf(out, " 0: Other\n");