summaryrefslogtreecommitdiff
path: root/src/bin/ethumb/ethumbd_slave.c
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-12 01:15:45 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-12 01:15:45 +0000
commit34f53151414bcdf44ec81e582b007f74da595694 (patch)
tree863058f0d94e9d39998774a375aa6d242d8714a4 /src/bin/ethumb/ethumbd_slave.c
parentae51833bac7ba5f72bd40a96beb13081c8d573f6 (diff)
merge ethumb.
This one was a painful bitch. The edbus2 port was quite broken, mainly leaking eina_stringshare and also not adding the '\0' to the strings that are represented as bytearray (paths cannot be utf8 to avoid translations). Emotion plugin was also quite bogus and the video thumbnail as edje (animated) is not working yet due bug in Edje_Edit api -- someone needs to investigate this, seems strange. Emotion plugin also had a bug that it was deleting the object from inside object callback. Now it seems to work. Please report if it does not. SVN revision: 82675
Diffstat (limited to '')
-rw-r--r--src/bin/ethumb/ethumbd_slave.c (renamed from legacy/ethumb/src/bin/ethumbd_child.c)34
1 files changed, 17 insertions, 17 deletions
diff --git a/legacy/ethumb/src/bin/ethumbd_child.c b/src/bin/ethumb/ethumbd_slave.c
index a11c90ca16..b1d319a305 100644
--- a/legacy/ethumb/src/bin/ethumbd_child.c
+++ b/src/bin/ethumb/ethumbd_slave.c
@@ -126,7 +126,7 @@ _ec_write_safe(int fd, const void *buf, ssize_t size)
126} 126}
127 127
128static int 128static int
129_ec_pipe_str_read(struct _Ethumbd_Child *ec __UNUSED__, char **str) 129_ec_pipe_str_read(struct _Ethumbd_Child *ec EINA_UNUSED, char **str)
130{ 130{
131 int size; 131 int size;
132 int r; 132 int r;
@@ -215,7 +215,7 @@ _ec_op_del(struct _Ethumbd_Child *ec)
215} 215}
216 216
217static void 217static void
218_ec_op_generated_cb(void *data __UNUSED__, Ethumb *e, Eina_Bool success) 218_ec_op_generated_cb(void *data EINA_UNUSED, Ethumb *e, Eina_Bool success)
219{ 219{
220 const char *thumb_path, *thumb_key; 220 const char *thumb_path, *thumb_key;
221 int size_path, size_key, size_cmd; 221 int size_path, size_key, size_cmd;
@@ -291,7 +291,7 @@ _ec_op_generate(struct _Ethumbd_Child *ec)
291} 291}
292 292
293static int 293static int
294_ec_fdo_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 294_ec_fdo_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
295{ 295{
296 int r; 296 int r;
297 int value; 297 int value;
@@ -306,7 +306,7 @@ _ec_fdo_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e)
306} 306}
307 307
308static int 308static int
309_ec_size_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 309_ec_size_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
310{ 310{
311 int r; 311 int r;
312 int w, h; 312 int w, h;
@@ -328,7 +328,7 @@ _ec_size_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e)
328} 328}
329 329
330static int 330static int
331_ec_format_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 331_ec_format_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
332{ 332{
333 int r; 333 int r;
334 int value; 334 int value;
@@ -343,7 +343,7 @@ _ec_format_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e)
343} 343}
344 344
345static int 345static int
346_ec_aspect_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 346_ec_aspect_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
347{ 347{
348 int r; 348 int r;
349 int value; 349 int value;
@@ -358,7 +358,7 @@ _ec_aspect_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e)
358} 358}
359 359
360static int 360static int
361_ec_orientation_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 361_ec_orientation_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
362{ 362{
363 int r; 363 int r;
364 int value; 364 int value;
@@ -373,7 +373,7 @@ _ec_orientation_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e)
373} 373}
374 374
375static int 375static int
376_ec_crop_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 376_ec_crop_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
377{ 377{
378 int r; 378 int r;
379 float x, y; 379 float x, y;
@@ -395,7 +395,7 @@ _ec_crop_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e)
395} 395}
396 396
397static int 397static int
398_ec_quality_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 398_ec_quality_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
399{ 399{
400 int r; 400 int r;
401 int value; 401 int value;
@@ -410,7 +410,7 @@ _ec_quality_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e)
410} 410}
411 411
412static int 412static int
413_ec_compress_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 413_ec_compress_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
414{ 414{
415 int r; 415 int r;
416 int value; 416 int value;
@@ -488,7 +488,7 @@ _ec_category_set(struct _Ethumbd_Child *ec, Ethumb *e)
488} 488}
489 489
490static int 490static int
491_ec_video_time_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 491_ec_video_time_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
492{ 492{
493 int r; 493 int r;
494 float value; 494 float value;
@@ -503,7 +503,7 @@ _ec_video_time_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e)
503} 503}
504 504
505static int 505static int
506_ec_video_start_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 506_ec_video_start_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
507{ 507{
508 int r; 508 int r;
509 float value; 509 float value;
@@ -518,7 +518,7 @@ _ec_video_start_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e)
518} 518}
519 519
520static int 520static int
521_ec_video_interval_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 521_ec_video_interval_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
522{ 522{
523 int r; 523 int r;
524 float value; 524 float value;
@@ -533,7 +533,7 @@ _ec_video_interval_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e)
533} 533}
534 534
535static int 535static int
536_ec_video_ntimes_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 536_ec_video_ntimes_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
537{ 537{
538 int r; 538 int r;
539 int value; 539 int value;
@@ -548,7 +548,7 @@ _ec_video_ntimes_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e)
548} 548}
549 549
550static int 550static int
551_ec_video_fps_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 551_ec_video_fps_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
552{ 552{
553 int r; 553 int r;
554 int value; 554 int value;
@@ -563,7 +563,7 @@ _ec_video_fps_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e)
563} 563}
564 564
565static int 565static int
566_ec_document_page_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) 566_ec_document_page_set(struct _Ethumbd_Child *ec EINA_UNUSED, Ethumb *e)
567{ 567{
568 int r; 568 int r;
569 int value; 569 int value;
@@ -731,7 +731,7 @@ _ec_setup(struct _Ethumbd_Child *ec)
731} 731}
732 732
733int 733int
734main(int argc __UNUSED__, const char *argv[] __UNUSED__) 734main(int argc EINA_UNUSED, const char *argv[] EINA_UNUSED)
735{ 735{
736 struct _Ethumbd_Child *ec; 736 struct _Ethumbd_Child *ec;
737 737