Ecore_List -> Eina_List

This commit is contained in:
Jaime Thomas
2008-12-18 18:54:50 +00:00
parent 83705771e3
commit 6a512c1163
8 changed files with 102 additions and 86 deletions

View File

@@ -6,8 +6,8 @@ struct Burn_Data
{
BurnDisc *disc;
BurnSession *session;
Ecore_List *sources;
Ecore_List *tracks;
Eina_List *sources;
Eina_List *tracks;
Ecdb_Project *proj;
};
@@ -16,8 +16,8 @@ int ecdb_burn_project_init(Ecdb_Burn_Project *proj);
int ecdb_erase_project_init(Ecdb_Erase_Project *proj);
static void ecdb_burn_progress_handler(void *data, void *buffer,
unsigned int nbyte);
void ecdb_sources_list_free(void *data);
void ecdb_tracks_list_free(void *data);
void ecdb_sources_list_free(Eina_List *list);
void ecdb_tracks_list_free(Eina_List *list);
Ecdb_Burn_Project *
@@ -91,10 +91,6 @@ ecdb_burn_project(Ecdb_Burn_Project *proj)
return FALSE;
}
data->proj = ECDB_PROJECT(proj);
data->sources = ecore_list_new();
data->tracks = ecore_list_new();
ecore_list_free_cb_set(data->sources, ecdb_sources_list_free);
ecore_list_free_cb_set(data->tracks, ecdb_tracks_list_free);
if (proj->burn_mode != BURN_AUDIO)
padding = 300*1024;
@@ -112,8 +108,8 @@ ecdb_burn_project(Ecdb_Burn_Project *proj)
printf("Failed to add any files to burn disc!\n");
burn_session_free(data->session);
burn_disc_free(data->disc);
ecore_list_destroy(data->sources);
ecore_list_destroy(data->tracks);
ecdb_sources_list_free(data->sources);
ecdb_tracks_list_free(data->tracks);
FREE(data);
return ECDB_ERROR_IMAGE_CREATE;
}
@@ -123,15 +119,15 @@ ecdb_burn_project(Ecdb_Burn_Project *proj)
printf("Error: Cannot attach source object to track object!\n");
burn_session_free(data->session);
burn_disc_free(data->disc);
ecore_list_destroy(data->sources);
ecore_list_destroy(data->tracks);
ecdb_sources_list_free(data->sources);
ecdb_tracks_list_free(data->tracks);
FREE(data);
return ECDB_ERROR_SOURCE_ATTACH;
}
burn_session_add_track(data->session, track, BURN_POS_END);
ecore_list_append(data->sources, source);
ecore_list_append(data->tracks, track);
data->sources = eina_list_append(data->sources, source);
data->tracks = eina_list_append(data->tracks, track);
opts = burn_write_opts_new(ECDB_PROJECT(proj)->drive->tangible[0].drive);
burn_write_opts_set_perform_opc(opts, proj->opc);
@@ -153,8 +149,8 @@ ecdb_burn_project(Ecdb_Burn_Project *proj)
burn_session_free(data->session);
burn_disc_free(data->disc);
burn_write_opts_free(opts);
ecore_list_destroy(data->sources);
ecore_list_destroy(data->tracks);
ecdb_sources_list_free(data->sources);
ecdb_tracks_list_free(data->tracks);
FREE(proj);
return ECDB_ERROR_WRITE_MODE;
}
@@ -271,8 +267,8 @@ ecdb_burn_finished(void *data, int type, void *event)
proj = data;
printf("Freeing source and tracks\n");
ecore_list_destroy(proj->sources);
ecore_list_destroy(proj->tracks);
ecdb_sources_list_free(proj->sources);
ecdb_tracks_list_free(proj->tracks);
printf("Freeing session and disc\n");
burn_session_free(proj->session);
@@ -302,13 +298,25 @@ ecdb_burn_finished(void *data, int type, void *event)
}
void
ecdb_sources_list_free(void *data)
ecdb_sources_list_free(Eina_List *list)
{
burn_source_free(data);
Eina_List *l;
void *data;
EINA_LIST_FOREACH(list, l, data)
burn_source_free(data);
list = eina_list_free(list);
}
void
ecdb_tracks_list_free(void *data)
ecdb_tracks_list_free(Eina_List *list)
{
burn_track_free(data);
Eina_List *l;
void *data;
EINA_LIST_FOREACH(list, l, data)
burn_track_free(data);
list = eina_list_free(list);
}