/* setup items */
memset(&items[l + 0], 0, sizeof(playlist_item_t));
- strncpy(items[l].id, dir->name, PATH_MAX);
- strncpy(items[l].title, dir->full, PATH_MAX);
+ strncpy(items[l].title, dir->name, PATH_MAX);
+ strncpy(items[l].id, dir->full, PATH_MAX);
items[l].dur = list->size;
};
return 0;
#endif
};
-
-
-#if 0
-playlist_item_t* omnplay_library_find(omnplay_instance_t* app, char* id)
-{
- int i;
- playlist_item_t* item = NULL;
-
- pthread_mutex_lock(&app->library.lock);
-
- for(i = 0; i < app->library.count && !item; i++)
- if(!strcasecmp(id, app->library.item[i].id))
- item = &app->library.item[i];
-
- pthread_mutex_unlock(&app->library.lock);
-
- return item;
-};
-
-
-void omnplay_library_sort(omnplay_instance_t* app)
-{
- int i, j, m;
- playlist_item_t item;
-
- for(i = 0; i < app->library.count; i++)
- {
- /* find max */
- for(j = i + 1, m = i; j < app->library.count; j++)
- if(strcasecmp(app->library.item[j].id, app->library.item[m].id) < 0)
- m = j;
-
- if(m != i)
- {
- item = app->library.item[i];
- app->library.item[i] = app->library.item[m];
- app->library.item[m] = item;
- };
- };
-};
-
-int omnplay_library_load_file(playlist_item_t* items, int *pcount, char* filename)
-{
- int i, c = 0, r = 0;
- FILE* f;
- char *l;
- int limit = *pcount;
- playlist_item_t item;
-
- /* allocate space for strings and items */
- l = malloc(PATH_MAX);
-
- *pcount = 0;
-
- /* open and process file */
- if((f = fopen(filename, "rt")))
- {
- while(!feof(f) && c < limit)
- {
- char *s, *sp_r, *sp_b;
-
- /* load string */
- memset(l, 0, PATH_MAX);
- fgets(l, PATH_MAX, f);
-
- /* remove newlines */
- if( (s = strchr(l, '\n')) ) *s = 0;
- if( (s = strchr(l, '\r')) ) *s = 0;
-
- /* check for empty line */
- if(l[0] && l[0] != '#' && l[0] != '|')
- {
- memset(&item, 0, sizeof(playlist_item_t));
-
- for(i = 0, sp_b = l; (NULL != (sp_r = strtok(sp_b, "\t"))); i++, sp_b = NULL)
- {
- switch(i)
- {
- case 0: strncpy(item.id, sp_r, PATH_MAX); break;
- case 1: tc2frames(sp_r, 25.0, &item.in); break;
- case 2: tc2frames(sp_r, 25.0, &item.dur); break;
- case 3: strncpy(item.title, sp_r, PATH_MAX); break;
- };
- };
-
- /* insert item */
- items[c++] = item;
- }
- else
- g_warning("omnplay_library_load_file: ignored line [%s]\n", l);
- }
-
- fclose(f);
- }
- else
- r = -1;
-
- /* free data */
- free(l);
-
- *pcount = c;
-
- g_warning("omnplay_library_load_file: loaded [%d] items from [%s] file, limit [%d]\n", c, filename, limit);
-
- return r;
-};
-
-
-static void omnplay_library_save_file(playlist_item_t* item, int count, char* filename)
-{
- int i;
- FILE* f;
-
- if((f = fopen(filename, "wt")))
- {
- char tc_in[32], tc_dur[32];
-
- for(i = 0; i < count; i++)
- fprintf(f, "%s\t%s\t%s\t%s\n",
- item[i].id,
- frames2tc(item[i].in, 25.0, tc_in),
- frames2tc(item[i].dur, 25.0, tc_dur),
- item[i].title);
- fclose(f);
- g_warning("omnplay_library_save_file: written [%d] lines to file [%s]\n", count, filename);
- };
-};
-
-void omnplay_library_save(omnplay_instance_t* app)
-{
- pthread_mutex_lock(&app->library.lock);
-
- if(app->library.filename[0])
- omnplay_library_save_file(app->library.item, app->library.count,
- app->library.filename);
-
- pthread_mutex_unlock(&app->library.lock);
-};
-
-static void omnplay_get_content_cb(omnplay_instance_t* app, playlist_item_t* item, void* data)
-{
- if(!(app->library.id_display_idx % app->library.id_display_rate))
- omnplay_set_status(app, item->id);
- app->library.id_display_idx++;
-};
-
-static void* omnplay_library_refresh_proc(void* data)
-{
- omnplay_instance_t* app = (omnplay_instance_t*)data;
- int count, i;
- playlist_item_t* items;
-
- gdk_threads_enter();
- gtk_widget_set_sensitive(app->window, FALSE);
- gdk_flush();
- gdk_threads_leave();
-
- omnplay_set_status(app, "Updating library...");
-
- items = (playlist_item_t*)malloc(sizeof(playlist_item_t) * MAX_LIBRARY_ITEMS);
-
- count = omnplay_get_content(app, items, MAX_LIBRARY_ITEMS, omnplay_get_content_cb, NULL);
-
- if(count > 0)
- {
- omnplay_set_status(app, "Quering whois...");
-
- if(app->library.whois[0])
- omnplay_whois_list(app, items, &count);
-
- omnplay_set_status(app, "Setting library...");
-
- pthread_mutex_lock(&app->library.lock);
-
- for(i = 0; i < count; i++)
- app->library.item[i] = items[i];
-
- app->library.count = count;
-
- omnplay_library_sort(app);
-
- pthread_mutex_unlock(&app->library.lock);
-
- gdk_threads_enter();
- omnplay_library_draw(app);
- gdk_flush();
- gdk_threads_leave();
- };
-
- omnplay_set_status(app, "Normalizing playlist...");
-
- free(items);
-
- gdk_threads_enter();
- omnplay_playlist_normalize(app);
- gdk_flush();
- gdk_threads_leave();
-
- omnplay_set_status(app, "");
-
- gdk_threads_enter();
- gtk_widget_set_sensitive(app->window, TRUE);
- gdk_flush();
- gdk_threads_leave();
-
-
- return NULL;
-};
-
-void omnplay_library_refresh(omnplay_instance_t* app)
-{
- if(app->library.refresh_thread)
- g_thread_join(app->library.refresh_thread);
-
- app->library.refresh_thread = g_thread_create(
- omnplay_library_refresh_proc, app, TRUE, NULL);
-};
-
-void omnplay_library_draw(omnplay_instance_t* app)
-{
- int i;
- char tc[12];
- GtkListStore *list_store;
- GtkTreeIter iter;
-
- list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(app->library_grid)));
- gtk_list_store_clear(list_store);
-
- pthread_mutex_lock(&app->library.lock);
-
- for(i = 0;i < app->library.count; i++)
- {
- gtk_list_store_append(list_store, &iter);
-
- gtk_list_store_set(list_store, &iter,
- 0, app->library.item[i].id,
- 1, frames2tc(app->library.item[i].dur, 25.0, tc),
- 2, app->library.item[i].title,
- 3, i,
- 4, FALSE,
- 5, "red",
- -1 );
- }
-
- pthread_mutex_unlock(&app->library.lock);
-};
-
-static void get_selected_idx_library_proc(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
-{
- int idx, *list = (int*)data;
- gtk_tree_model_get(model, iter, 3, &idx, -1);
- list[list[0] + 1] = idx;
- list[0] = list[0] + 1;
-};
-
-static int* get_selected_idx_library(omnplay_instance_t* app)
-{
- int* list = NULL;
- GtkTreeSelection *selection;
-
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(app->library_grid));
- if(selection)
- {
- list = (int*)malloc(sizeof(int) * (MAX_LIBRARY_ITEMS + 1));
- memset(list, 0, sizeof(int) * (MAX_LIBRARY_ITEMS + 1));
-
- gtk_tree_selection_selected_foreach(
- selection,
- get_selected_idx_library_proc,
- list);
-
- if(!list[0])
- {
- free(list);
- list = NULL;
- };
- };
-
- return list;
-};
-
-
-playlist_item_t* omnplay_library_get_selected(omnplay_instance_t* app, int *count)
-{
- int* idxs;
- playlist_item_t* items = NULL;
-
- pthread_mutex_lock(&app->library.lock);
-
- *count = 0;
-
- idxs = get_selected_idx_library(app);
-
- if(idxs)
- {
- int i;
-
- /* alloc items */
- items = (playlist_item_t*)malloc(sizeof(playlist_item_t) * (idxs[0] + 1));
-
- /* clear last item */
- memset(&items[idxs[0]], 0, sizeof(playlist_item_t));
-
- /* copy items */
- for(i = 0; i < idxs[0]; i++)
- items[i] = app->library.item[idxs[i + 1]];
-
- *count = idxs[0];
- free(idxs);
- };
-
- pthread_mutex_unlock(&app->library.lock);
-
- return items;
-};
-
-void omnplay_library_search(omnplay_instance_t* app, int next)
-{
- int idx = 0, i;
- int* idxs;
- const char *search;
- GtkTreePath* path;
-
- pthread_mutex_lock(&app->library.lock);
-
- idxs = get_selected_idx_library(app);
- if(idxs) idx = idxs[1];
- free(idxs);
-
- if(!next) idx = 0;
- else idx++;
-
- search = gtk_entry_get_text(GTK_ENTRY(app->library.search));
-
- if(search[0])
- {
- for(i = idx; i < app->library.count; i++)
- if( strcasestr(app->library.item[i].id, search) ||
- strcasestr(app->library.item[i].title, search))
- break;
-
- if(i < app->library.count)
- {
- g_warning("found at pos=%d\n", i);
-
- /* select */
- path = gtk_tree_path_new_from_indices(i, -1);
- gtk_tree_selection_select_path(gtk_tree_view_get_selection(
- GTK_TREE_VIEW(app->library_grid)), path);
- gtk_tree_view_set_cursor(GTK_TREE_VIEW(app->library_grid), path, NULL, FALSE);
- gtk_tree_path_free(path);
- };
- };
-
- pthread_mutex_unlock(&app->library.lock);
-};
-
-#endif
pthread_mutex_unlock(&app->playlist.lock);
};
-#if 0
-static int playlist_load_file_ply(instance_t* app, char* filename)
+static int playlist_load_plt(instance_t* app, char* filename, char* err_buf, int err_len)
{
FILE* f;
- char *ID, *CH, *B, *IN, *OUT, *DUR, *REST, *l;
- int count = 0, i;
+ char *line;
+ int count = 0, i = 0;
playlist_item_t* items;
+ f = fopen(filename, "rt");
+
+ if(!f)
+ {
+ i = errno;
+ snprintf(err_buf, err_len, "Failed to open file [%s], error: %s",
+ filename, strerror(i));
+ return -i;
+ };
+
/* allocate space for strings and items */
items = malloc(sizeof(playlist_item_t) * MAX_PLAYLIST_ITEMS);
memset(items, 0, sizeof(playlist_item_t) * MAX_PLAYLIST_ITEMS);
- ID = malloc(PATH_MAX);
- CH = malloc(PATH_MAX);
- B = malloc(PATH_MAX);
- IN = malloc(PATH_MAX);
- OUT = malloc(PATH_MAX);
- DUR = malloc(PATH_MAX);
- REST = malloc(PATH_MAX);
- l = malloc(PATH_MAX);
-
- /* open and process file */
- f = fopen(filename, "rt");
- if(f)
+ line = malloc(PATH_MAX);
+
+ while(1)
{
- while( !feof(f) )
- {
- char* s;
+ char* s;
- /* load string */
- memset(l, 0, PATH_MAX);
- fgets(l, PATH_MAX, f);
+ if(feof(f))
+ break;
- /* remove newlines */
- if( (s = strchr(l, '\n')) ) *s = 0;
- if( (s = strchr(l, '\r')) ) *s = 0;
- if( (s = strchr(l, '\t')) ) *s = 0;
+ /* load string */
+ memset(line, 0, PATH_MAX);
+ fgets(line, PATH_MAX, f);
- /* check for empty line */
- if(l[0] && l[0] != '#')
- {
- if (6 != sscanf(l, "%128[^,],%128[^,],%128[^,],%128[^,],%128[^,],%128[^,],%s",
- ID, CH, B, IN, OUT, DUR, REST))
- {
- int b = atol(B);
- /* setup item */
- tc2frames(IN, 25.0, &items[count].in);
- tc2frames(DUR, 25.0, &items[count].dur);
- strncpy(items[count].id, ID, PATH_MAX);
- items[count].player = atol(CH) - 1;
- switch(b)
- {
- case 1: items[count].type = PLAYLIST_ITEM_BLOCK_SINGLE; break;
- case 2: items[count].type = PLAYLIST_ITEM_LOOP_BEGIN; break;
- case 3: items[count].type = PLAYLIST_ITEM_LOOP_BODY; break;
- case 4: items[count].type = PLAYLIST_ITEM_LOOP_END; break;
- case 6: items[count].type = PLAYLIST_ITEM_BLOCK_END; break;
- case 0:
- if(!count)
- items[count].type = PLAYLIST_ITEM_BLOCK_BEGIN;
- else if(items[count - 1].type == PLAYLIST_ITEM_BLOCK_BEGIN ||
- items[count - 1].type == PLAYLIST_ITEM_BLOCK_BODY)
- items[count].type = PLAYLIST_ITEM_BLOCK_BODY;
- else
- items[count].type = PLAYLIST_ITEM_BLOCK_BEGIN;
- break;
- default:
- if(b >= 1024)
- items[count].type = b - 1024;
- };
-#if 0
- {
- char* n;
- switch(items[count].type)
- {
- case PLAYLIST_ITEM_BLOCK_BEGIN: n = "BLOCK_BEGIN"; break;
- case PLAYLIST_ITEM_BLOCK_BODY: n = "BLOCK_BODY"; break;
- case PLAYLIST_ITEM_BLOCK_END: n = "BLOCK_END"; break;
- case PLAYLIST_ITEM_BLOCK_SINGLE: n = "BLOCK_SINGLE"; break;
- case PLAYLIST_ITEM_LOOP_BEGIN: n = "LOOP_BEGIN"; break;
- case PLAYLIST_ITEM_LOOP_BODY: n = "LOOP_BODY"; break;
- case PLAYLIST_ITEM_LOOP_END: n = "LOOP_END"; break;
- case PLAYLIST_ITEM_LOOP_SINGLE: n = "LOOP_SINGLE"; break;
- };
- fprintf(stderr, "src=[%s]\ndst=[idx=%d,block=%s,block_id=%d,in=%d,out=%d]\n",
- l, count, n, items[count].type, items[count].in, items[count].dur);
- };
-#endif
+ /* remove newlines */
+ if( (s = strchr(line, '\n')) ) *s = 0;
+ if( (s = strchr(line, '\r')) ) *s = 0;
+
+ /* check for empty line */
+ if(!line[0] || line[0] == '#')
+ continue;
+ /* check item contine */
+ if(line[0] == '\t')
+ {
+ /* line without header */
+ if(!i)
+ continue;
+
+ /* load playlist item */
+ switch(i)
+ {
+ case 1: // title
+ strncpy(items[count].title, line + 1, PATH_MAX);
+ i++;
+ break;
+
+ case 2: // in
+ tc2frames(line + 1, 25.0, &items[count].in);
+ i++;
+ break;
+
+ case 3: // dur
+ tc2frames(line + 1, 25.0, &items[count].dur);
+ i++;
+ break;
+
+ case 4: // player
+ items[count].player = atol(line + 1) - 1;
+ i++;
+ break;
+
+ case 5: // type
+ items[count].type = atol(line + 1) - 1024;
+
+ /* last item - break a chain */
+ i = 0;
count++;
- }
+ break;
};
}
+ else
+ {
+ strcpy(items[count].id, line);
+ i = 1;
+ };
- fclose(f);
- }
+ };
+
+ fclose(f);
/* add loaded items to playlist */
if(count)
pthread_mutex_unlock(&app->playlist.lock);
}
- /* free data */
+ /* free items */
+ free(line);
free(items);
- free(ID);
- free(CH);
- free(IN);
- free(OUT);
- free(DUR);
- free(REST);
- free(l);
-
- return count;
-};
-static int playlist_save_file_ply(instance_t* app, char* filename)
-{
-};
-#endif
-
-static int playlist_load_plt(instance_t* app, char* filename, char* err_buf, int err_len)
-{
return 0;
};
G_TYPE_STRING
},
{
- "ID",
+ "TITLE",
G_TYPE_STRING
},
{
G_TYPE_STRING
},
{
- "TITLE",
+ "ID",
G_TYPE_STRING
},
{
0, "",
1, app->playlist.block_icons[app->playlist.item[i].type],
2, ch,
- 3, app->playlist.item[i].id,
+ 3, app->playlist.item[i].title,
4, frames2tc(app->playlist.item[i].in, 25.0, tc1),
5, frames2tc(app->playlist.item[i].dur, 25.0, tc2),
- 6, app->playlist.item[i].title,
+ 6, app->playlist.item[i].id,
7, i,
8, (app->playlist.item[i].error != 0),
9, (app->playlist.item[i].error & PLAYLIST_ITEM_ERROR_LIB)?"red":"orange",
0, "",
1, app->playlist.block_icons[app->playlist.item[i].type],
2, ch,
- 3, app->playlist.item[i].id,
+ 3, app->playlist.item[i].title,
4, frames2tc(app->playlist.item[i].in, 25.0, tc1),
5, frames2tc(app->playlist.item[i].dur, 25.0, tc2),
- 6, app->playlist.item[i].title,
+ 6, app->playlist.item[i].id,
7, i,
8, (app->playlist.item[i].error != 0),
9, (app->playlist.item[i].error & PLAYLIST_ITEM_ERROR_LIB)?"red":"orange",
filename2 = (char*)malloc(PATH_MAX);
strncpy(filename2, filename, PATH_MAX);
l = strlen(filename2);
- if(l < 4 || strcasecmp(filename2 + i - 4, procs[i].ext + 1))
+ if(l < 4 || strcasecmp(filename2 + l - 4, procs[i].ext + 1))
strcat(filename2, procs[i].ext + 1);
r = procs[i].load(app, filename2, error_message, sizeof(error_message));
filename2 = (char*)malloc(PATH_MAX);
strncpy(filename2, filename, PATH_MAX);
l = strlen(filename2);
- if(l < 4 || strcasecmp(filename2 + i - 4, procs[i].ext + 1))
+ if(l < 4 || strcasecmp(filename2 + l - 4, procs[i].ext + 1))
strcat(filename2, procs[i].ext + 1);
r = procs[i].save(app, filename2, error_message, sizeof(error_message));