cosmetic updates ;-)

[ptouch-print] / src / libptouch.c

diff --git a/src/libptouch.c b/src/libptouch.c
index c7949e53379aa6022758687e35407b02e4ae56a0..bd530102a616a7aacab4fc0bca5e6d4d7b66d5fa 100644 (file)
--- a/src/libptouch.c
+++ b/src/libptouch.c
@@ -1,7 +1,7 @@
 /*
        libptouch - functions to help accessing a brother ptouch
 
-       Copyright (C) 2013 Dominic Radermacher <dominic.radermacher@gmail.com>
+       Copyright (C) 2013-2017 Dominic Radermacher <blip@mockmoon-cybernetics.ch>
 
        This program is free software; you can redistribute it and/or modify it
        under the terms of the GNU General Public License version 3 as
@@ -42,8 +42,13 @@ struct _pt_tape_info tape_info[6]= {
 };
 
 struct _pt_dev_info ptdevs[] = {
-       {0x04f9, 0x202d, "PT-2430PC", 128, 0},  /* 180dpi, maximum 128px */
-       {0x04f9, 0x202c, "PT-1230PC", 76, 0},   /* 180dpi, supports tapes up to 12mm - I don't know how much pixels it can print! */
+       {0x04f9, 0x202d, "PT-2430PC", 128, FLAG_NONE},  /* 180dpi, maximum 128px */
+       {0x04f9, 0x202c, "PT-1230PC", 76, FLAG_NONE},   /* 180dpi, supports tapes up to 12mm - I don't know how much pixels it can print! */
+       {0x04f9, 0x2061, "PT-P700", 120, FLAG_UNSUP_RASTER},    /* DOES NOT WORK */
+       {0x04f9, 0x2073, "PT-D450VP", 120, FLAG_UNSUP_RASTER},  /* DOES NOT WORK */
+       /* Notes about the PT-D450VP: Tape detecting works, but printing does
+          not. The tape is just blank. I assume, the printer does not understand
+          the sent rasterdata. I'm also unsure about how many dots width we have */
        {0,0,"",0,0}
 };
 
@@ -62,6 +67,10 @@ int ptouch_open(ptouch_dev *ptdev)
                fprintf(stderr, _("out of memory\n"));
                return -1;
        }
+       if (((*ptdev)->devinfo=malloc(sizeof(struct _pt_dev_info))) == NULL) {
+               fprintf(stderr, _("out of memory\n"));
+               return -1;
+       }
        if ((libusb_init(NULL)) < 0) {
                fprintf(stderr, _("libusb_init() failed\n"));
                return -1;
@@ -97,6 +106,8 @@ int ptouch_open(ptouch_dev *ptdev)
                                        return -1;
                                }
                                (*ptdev)->h=handle;
+                               (*ptdev)->devinfo->max_px=ptdevs[k].max_px;
+                               (*ptdev)->devinfo->flags=ptdevs[k].flags;
                                return 0;
                        }
                }
@@ -272,6 +283,8 @@ int ptouch_getstatus(ptouch_dev ptdev)
 
 int ptouch_getmaxwidth(ptouch_dev ptdev)
 {
+       /* TODO: should also check what the device supports. but I assume,
+          you can't use a large tape in a printe that doesn't support it anyways */
        return ptdev->tape_width_px;
 }