slp/selphy_print
1
0
Fork 0
Code Issues 48 Pull requests Activity

multiple: Fast return should not be used when backend generates copies

Browse source
This commit is contained in:
Solomon Peachy 2017-12-07 14:07:26 -05:00
parent 282906daf6
commit 96e4ef4ed5
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend_canonselphyneo.c
View file

@ -347,7 +347,7 @@ top:
return CUPS_BACKEND_STOP;
}
if (rdback.data[0] > 0x02 && fast_return) {
if (rdback.data[0] > 0x02 && fast_return && copies <= 1) {
INFO("Fast return mode enabled.\n");
break;
}
@ -397,7 +397,7 @@ static void selphyneo_cmdline(void)
struct dyesub_backend canonselphyneo_backend = {
.name = "Canon SELPHY CPneo",
.version = "0.09",
.version = "0.10",
.uri_prefix = "canonselphyneo",
.cmdline_usage = selphyneo_cmdline,
.cmdline_arg = selphyneo_cmdline_arg,

4
backend_dnpds40.c
View file

@ -1570,7 +1570,7 @@ top:
}
sleep(1); /* Give things a moment */
if (fast_return) {
if (fast_return && !ctx->manual_copies) {
INFO("Fast return mode enabled.\n");
} else {
INFO("Waiting for job to complete...\n");
@ -2488,7 +2488,7 @@ static int dnpds40_cmdline_arg(void *vctx, int argc, char **argv)
/* Exported */
struct dyesub_backend dnpds40_backend = {
.name = "DNP DS40/DS80/DSRX1/DS620",
.version = "0.92",
.version = "0.93",
.uri_prefix = "dnpds40",
.cmdline_usage = dnpds40_cmdline,
.cmdline_arg = dnpds40_cmdline_arg,

4
backend_mitsu70x.c
View file

@ -1713,7 +1713,7 @@ skip_status:
break;
}
if (fast_return) {
if (fast_return && copies <= 1) { /* Copies generated by backend! */
INFO("Fast return mode enabled.\n");
break;
}
@ -1953,7 +1953,7 @@ static int mitsu70x_cmdline_arg(void *vctx, int argc, char **argv)
/* Exported */
struct dyesub_backend mitsu70x_backend = {
.name = "Mitsubishi CP-D70/D707/K60/D80",
.version = "0.68",
.version = "0.69",
.uri_prefix = "mitsu70x",
.cmdline_usage = mitsu70x_cmdline,
.cmdline_arg = mitsu70x_cmdline_arg,