From 9571e941a6598426b7ac03f2e55b7706e09950b5 Mon Sep 17 00:00:00 2001 From: Jaime Thomas Date: Mon, 17 Nov 2008 20:19:35 +0000 Subject: [PATCH] Winner!11!11!1!! Erase progress works now!!!!!11!!!?<>_~!~! --- ecdb/trunk/src/ecdb_burn.c | 7 +++---- ecdb/trunk/src/ecdb_erase.c | 17 +++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ecdb/trunk/src/ecdb_burn.c b/ecdb/trunk/src/ecdb_burn.c index 908ce6a..8a606b6 100644 --- a/ecdb/trunk/src/ecdb_burn.c +++ b/ecdb/trunk/src/ecdb_burn.c @@ -183,16 +183,15 @@ ecdb_drive_progress_update(void *data) } else if (stat == BURN_DRIVE_IDLE) { - ecore_pipe_write(proj->pipe, NULL, 0); + ecore_pipe_write(proj->pipe, "AC", + sizeof("AC")); ecore_pipe_del(proj->pipe); /* Call the finished event handler here */ pthread_exit(NULL); break; } - // Arg... too tired to figure this out now - //ecore_pipe_write(proj->pipe, &p, sizeof(p)); - printf("%d/%d\n", p.sector, p.sectors); + ecore_pipe_write(proj->pipe, &p, sizeof(p)); sleep(1); } } diff --git a/ecdb/trunk/src/ecdb_erase.c b/ecdb/trunk/src/ecdb_erase.c index d6b4a2f..8bf0300 100644 --- a/ecdb/trunk/src/ecdb_erase.c +++ b/ecdb/trunk/src/ecdb_erase.c @@ -92,25 +92,26 @@ ecdb_erase_disc(Ecdb_Erase_Project *proj) static void ecdb_erase_progress_handler(void *data, void *buffer, unsigned int nbyte) { - BurnProgress *p = buffer; + BurnProgress *p; Evas_Object *swallow; char buf[1024]; + char *text = buffer; - // Is this correct? - // Check this - if (sizeof(buffer) == sizeof(BurnProgress)) - { - p = buffer; - } - else + if ((nbyte != sizeof(BurnProgress)) || (!strcmp(text, "AC"))) { ecore_event_add(ECDB_DRIVE_ACTION_FINISHED, NULL, NULL, NULL); return; } + else + { + p = buffer; + text = NULL; + } swallow = evas_object_name_find(ecore_evas_get(em->main_win_ee), "erase_page"); snprintf(buf, sizeof(buf), "%d/%d", p->sector, p->sectors); + printf("buf: %s\n", buf); edje_object_part_text_set(swallow, "progress_text", buf); }