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

Fix a couple warnings and problems

Browse Source
This commit is contained in:
Jaime Thomas 2008-05-21 01:38:44 +00:00
parent 2fe68e7745
commit f210984e81
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ecdb/trunk/src/ecdb.c
View File

@ -56,7 +56,6 @@ main(int argc, char **argv)
} }
i++; i++;
} }
proj->simulate = TRUE;
proj->publisher_id = proj->data_preparer_id = proj->system_id = proj->publisher_id = proj->data_preparer_id = proj->system_id =
proj->application_id = proj->copywrite_id = proj->application_id = proj->copywrite_id =
proj->abstract_id = proj->biblio_id = "ecdb"; proj->abstract_id = proj->biblio_id = "ecdb";
@ -82,8 +81,8 @@ main(int argc, char **argv)
SHUTDOWN: SHUTDOWN:
burn_finish(); burn_finish();
iso_finish(); iso_finish();
ecore_shutdown();
ecore_file_shutdown(); ecore_file_shutdown();
ecore_shutdown();
printf("Program Done\n"); printf("Program Done\n");
return ret; return ret;
}; };

15
ecdb/trunk/src/ecdb_burn.c
View File

@ -114,8 +114,13 @@ ecdb_burn_project(Ecdb_Burn_Project *proj)
track = burn_track_create(); track = burn_track_create();
burn_track_define_data(track, 0, padding, 1, proj->burn_mode); burn_track_define_data(track, 0, padding, 1, proj->burn_mode);
while ((source = ecdb_image_project(proj))) source = ecdb_image_project(proj);
if (!source)
{ {
printf("Failed to add any files to burn disc!\n");
return FALSE;
}
if (burn_track_set_source(track, source) != BURN_SOURCE_OK) if (burn_track_set_source(track, source) != BURN_SOURCE_OK)
{ {
printf("Error: Cannot attach source object to track " printf("Error: Cannot attach source object to track "
@ -126,14 +131,6 @@ ecdb_burn_project(Ecdb_Burn_Project *proj)
burn_session_add_track(data->session, track, BURN_POS_END); burn_session_add_track(data->session, track, BURN_POS_END);
ecore_list_append(data->sources, source); ecore_list_append(data->sources, source);
ecore_list_append(data->tracks, track); ecore_list_append(data->tracks, track);
i++;
}
if (!i)
{
printf("Failed to add any files to burn disc!\n");
return FALSE;
}
opts = burn_write_opts_new(ECDB_PROJECT(proj)->drive-> opts = burn_write_opts_new(ECDB_PROJECT(proj)->drive->
tangible[0].drive); tangible[0].drive);

7
ecdb/trunk/src/ecdb_image.c
View File

@ -47,8 +47,8 @@ ecdb_source_child_append(Ecdb_Source *src, Ecdb_Source *child)
src->num_children++; src->num_children++;
src->children = realloc(src->children, sizeof(Ecdb_Source) * src->children = realloc(src->children, sizeof(Ecdb_Source) *
(src->num_children + 1)); (src->num_children + 1));
src->children[src->num_children] = child; src->children[src->num_children - 1] = child;
src->children[src->num_children + 1] = NULL; src->children[src->num_children] = NULL;
} }
void void
@ -99,11 +99,10 @@ ecdb_image_project(Ecdb_Burn_Project *proj)
IsoWriteOpts *opts; IsoWriteOpts *opts;
BurnSource *data_src, *fifo_src; BurnSource *data_src, *fifo_src;
if ((!proj->files) || (!proj->files->dst)) if ((!proj->files) || (!proj->files->num_children))
return NULL; return NULL;
/* To handle already-suplied image files */ /* To handle already-suplied image files */
efreet_mime_init();
if (proj->files->num_children == 1) if (proj->files->num_children == 1)
{ {
efreet_mime_init(); efreet_mime_init();