libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a bunch of mistakes I made before.

Browse Source
This commit is contained in:
Jaime Thomas
2009-02-17 22:48:11 +00:00
parent 2fb05a62d4
commit 6a4420575a
11 changed files with 183 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
experimental/ecdb/trunk/src/ecdb_erase.c
View File

@@ -1,12 +1,12 @@
/* vim: set sw=3 ts=3 sts=3 expandtab: */
#include "ecdb.h"
typedef struct Erase_Data Erase_Data;
struct Erase_Data
{
Ecdb_Project *proj;
Ecdb_Page *page;
};
typedef struct Erase_Data Erase_Data;
struct Erase_Data
{
Ecdb_Project *proj;
Ecdb_Page *page;
};
static void ecdb_erase_progress_handler(void *data, void *buffer,
unsigned int nbyte);
@@ -17,16 +17,16 @@ int
ecdb_erase_disc(Ecdb_Erase_Project *proj, Ecdb_Page *page)
{
BurnDriveStatus disc_state;
pthread_t progress_update;
Erase_Disc *data;
data = calloc(1, sizeof(Erase_Data));
if (!data)
{
printf("ecdb_erase_disc: NULL data!\n");
return FALSE;
}
data->proj = proj;
pthread_t progress_update;
Erase_Data *data;
data = calloc(1, sizeof(Erase_Data));
if (!data)
{
printf("ecdb_erase_disc: NULL data!\n");
return FALSE;
}
data->proj = ECDB_PROJECT(proj);
data->page = page;
disc_state = burn_disc_get_status(ECDB_PROJECT(proj)->drive->
@@ -71,7 +71,7 @@ static void
ecdb_erase_progress_handler(void *data, void *buffer, unsigned int nbyte)
{
BurnProgress *p;
Evas_Object *swallow;
Evas_Object *swallow;
Erase_Data *edata;
static int last_sector = 0;
Edje_Message_Int_Set *progress_msg;
@@ -101,30 +101,30 @@ ecdb_erase_progress_handler(void *data, void *buffer, unsigned int nbyte)
else
{
last_sector = p->sectors;
}
edata = data;
if (!edata)
{
printf("ecdb_erase_progress_handler: NULL edata!\n");
return;
}
if ((!edata->page) || (!edata->proj))
{
printf("ecdb_erase_progress_handler: NULL page or proj!\n");
return;
}
switch (proj->type)
{
case ECDB_ERASE_PROJECT:
swallow = page->erase;
break;
default:
printf("ecdb_erase_progress_handler: Unrecognized project type!\n")
return;
}
edata = data;
if (!edata)
{
printf("ecdb_erase_progress_handler: NULL edata!\n");
return;
}
if ((!edata->page) || (!edata->proj))
{
printf("ecdb_erase_progress_handler: NULL page or proj!\n");
return;
}
switch (edata->proj->type)
{
case ECDB_ERASE_PROJECT:
swallow = edata->page->erase;
break;
default:
printf("ecdb_erase_progress_handler: Unrecognized project type!\n");
return;
}
progress_msg = alloca(sizeof(Edje_Message_Int_Set) + (2 * sizeof(int)));
@@ -138,18 +138,19 @@ ecdb_erase_progress_handler(void *data, void *buffer, unsigned int nbyte)
int
ecdb_erase_finished(void *data, int type, void *event)
{
{
Erase_Data *ed;
Ecdb_Erase_Project *proj;
ed = data;
proj = ed->proj;
ed = data;
proj = ECDB_ERASE(ed->proj);
burn_drive_release(ECDB_PROJECT(proj)->drive->tangible[0].drive, 0);
burn_drive_info_free(ECDB_PROJECT(proj)->drive->tangible);
ecore_event_handler_del(ECDB_PROJECT(proj)->ev_handler);
ecore_pipe_del(ECDB_PROJECT(proj)->pipe);
ecdb_erase_cleanup(ed->page);
FREE(ed);
return TRUE;
}