X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpython%2Fgfx.c;h=c9f3fa28fa1ce37b9a3257a96ad68f450f3ab2e7;hb=5bfcb8ccd1c44cdea7d3438542b5fe50ec0760aa;hp=016d1ced8fbe9f26be9de6243cdddb91874532dd;hpb=01e7601c1b7be247c2060255ea59ca866ea4345f;p=swftools.git

diff --git a/lib/python/gfx.c b/lib/python/gfx.c
index 016d1ce..c9f3fa2 100644
--- a/lib/python/gfx.c
+++ b/lib/python/gfx.c
@@ -69,15 +69,15 @@ static char* strf(char*format, ...)
 
 //---------------------------------------------------------------------
 staticforward PyObject* output_save(PyObject* _self, PyObject* args, PyObject* kwargs);
-staticforward PyObject* output_startframe(PyObject* _self, PyObject* args, PyObject* kwargs);
-staticforward PyObject* output_endframe(PyObject* _self, PyObject* args, PyObject* kwargs);
+staticforward PyObject* output_startpage(PyObject* _self, PyObject* args, PyObject* kwargs);
+staticforward PyObject* output_endpage(PyObject* _self, PyObject* args, PyObject* kwargs);
 
 static PyMethodDef output_methods[] =
 {
     /* Output functions */
     {"save", (PyCFunction)output_save, METH_KEYWORDS, ""},
-    {"startframe", (PyCFunction)output_startframe, METH_KEYWORDS, ""},
-    {"endframe", (PyCFunction)output_endframe, METH_KEYWORDS, ""},
+    {"startpage", (PyCFunction)output_startpage, METH_KEYWORDS, ""},
+    {"endpage", (PyCFunction)output_endpage, METH_KEYWORDS, ""},
     {0,0,0,0}
 };
 static PyObject* output_save(PyObject* _self, PyObject* args, PyObject* kwargs)
@@ -96,7 +96,7 @@ static PyObject* output_save(PyObject* _self, PyObject* args, PyObject* kwargs)
     result->destroy(result);
     return PY_NONE;
 }
-static PyObject* output_startframe(PyObject* _self, PyObject* args, PyObject* kwargs)
+static PyObject* output_startpage(PyObject* _self, PyObject* args, PyObject* kwargs)
 {
     OutputObject* self = (OutputObject*)_self;
     int width=0, height=0;
@@ -105,7 +105,7 @@ static PyObject* output_startframe(PyObject* _self, PyObject* args, PyObject* kw
     self->output_device->startpage(self->output_device, width, height);
     return PY_NONE;
 }
-static PyObject* output_endframe(PyObject* _self, PyObject* args, PyObject* kwargs)
+static PyObject* output_endpage(PyObject* _self, PyObject* args, PyObject* kwargs)
 {
     OutputObject* self = (OutputObject*)_self;
     if (!PyArg_ParseTuple(args, ""))
@@ -312,11 +312,15 @@ static int page_print(PyObject * _self, FILE *fi, int flags)
 //---------------------------------------------------------------------
 
 staticforward PyObject* doc_getPage(PyObject* parent, PyObject* args, PyObject* kwargs);
+staticforward PyObject* doc_getInfo(PyObject* parent, PyObject* args, PyObject* kwargs);
+staticforward PyObject* doc_setParameter(PyObject* parent, PyObject* args, PyObject* kwargs);
 
 static PyMethodDef doc_methods[] =
 {
     /* PDF functions */
     {"getPage", (PyCFunction)doc_getPage, METH_KEYWORDS, ""},
+    {"getInfo", (PyCFunction)doc_getInfo, METH_KEYWORDS, ""},
+    {"setParameter", (PyCFunction)doc_setParameter, METH_KEYWORDS, ""},
     {0,0,0,0}
 };
 
@@ -341,6 +345,32 @@ static PyObject* doc_getPage(PyObject* _self, PyObject* args, PyObject* kwargs)
     return (PyObject*)page;
 }
 
+static PyObject* doc_getInfo(PyObject* _self, PyObject* args, PyObject* kwargs)
+{
+    DocObject* self = (DocObject*)_self;
+
+    static char *kwlist[] = {"key", NULL};
+    char*key = 0;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &key))
+	return NULL;
+
+    char*s = self->doc->getinfo(self->doc, key);
+    return PyString_FromString(s);
+}
+
+static PyObject* doc_setParameter(PyObject* _self, PyObject* args, PyObject* kwargs)
+{
+    DocObject* self = (DocObject*)_self;
+
+    static char *kwlist[] = {"key", "value", NULL};
+    char*key = 0, *value=0;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss", kwlist, &key,&value))
+	return NULL;
+
+    self->doc->set_parameter(self->doc, key, value);
+    return PY_NONE;
+}
+
 static PyObject* f_open(PyObject* parent, PyObject* args, PyObject* kwargs)
 {
     static char *kwlist[] = {"type", "filename", NULL};
@@ -442,7 +472,17 @@ static PyObject* f_setoption(PyObject* self, PyObject* args, PyObject* kwargs)
     char*key=0,*value=0;
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss", kwlist, &key, &value))
 	return NULL;
-    pdfdriver->set_parameter(key,value);
+    pdfdriver->set_parameter(pdfdriver,key,value);
+    return PY_NONE;
+}
+
+static PyObject* f_verbose(PyObject* self, PyObject* args, PyObject* kwargs)
+{
+    static char *kwlist[] = {"val", NULL};
+    int val;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &val))
+	return NULL;
+    setConsoleLogging(val);
     return PY_NONE;
 }
 
@@ -452,7 +492,7 @@ static PyObject* f_addfont(PyObject* self, PyObject* args, PyObject* kwargs)
     char*filename=0;
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &filename))
 	return NULL;
-    pdfdriver->set_parameter("font", filename);
+    pdfdriver->set_parameter(pdfdriver,"font", filename);
     return PY_NONE;
 }
 
@@ -462,7 +502,7 @@ static PyObject* f_addfontdir(PyObject* self, PyObject* args, PyObject* kwargs)
     char*filename=0;
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &filename))
 	return NULL;
-    pdfdriver->set_parameter("fontdir", filename);
+    pdfdriver->set_parameter(pdfdriver,"fontdir", filename);
     return PY_NONE;
 }
 
@@ -473,6 +513,7 @@ static PyMethodDef pdf2swf_methods[] =
     {"addfont", (PyCFunction)f_addfont, METH_KEYWORDS, ""},
     {"addfontdir", (PyCFunction)f_addfontdir, METH_KEYWORDS, ""},
     {"setoption", (PyCFunction)f_setoption, METH_KEYWORDS, ""},
+    {"verbose", (PyCFunction)f_verbose, METH_KEYWORDS, ""},
 
     /* devices */
     {"SWF", (PyCFunction)f_createSWF, METH_KEYWORDS, ""},