diff --git a/src/fb.c b/src/fb.c index 34548c0..e768870 100644 --- a/src/fb.c +++ b/src/fb.c @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -523,45 +524,146 @@ fb_exit(void) playlist_clear(); } -void -fb_shuffle(int shuffle) +static void +recurse_find_audio(char* cur, char** item, int* nextitem) { - char **item, *tmp; - int i, j, k, n; + DIR *d = NULL; + struct dirent *de = NULL; + struct stat64 sb; + int i; + char comp1[PATH_SIZE]; + char comp2[PATH_SIZE]; + char curdir[PATH_SIZE]; - if (shuffle) - mvpw_set_menu_title(playlist_widget, "Shuffle Play"); - else - mvpw_set_menu_title(playlist_widget, "Play All"); + // Append a trailing slash to the current path + snprintf(curdir, PATH_SIZE, "%s/", cur); + printf("Recursing directory %s for audio files\n", curdir); - if (file_count == 0) { - gui_error("No files exist in this directory."); + d = opendir(curdir); + if (d == NULL) { + printf("Not a directory: %s", curdir); return; } - if (file_count > 256) - n = 256; - else - n = file_count; + int noitems = 0; + char** contents = alloca(sizeof(char*) * MAX_PLAYLIST_ENTRIES); + while ( (de = readdir(d)) != NULL && noitems < MAX_PLAYLIST_ENTRIES) { + + // Ignore ./.. or blank name directories + if (*de->d_name == '.' || *de->d_name == '/' || *de->d_name == '\0') { + continue; + } - item = alloca(sizeof(char*)*n); + char path[PATH_SIZE]; + snprintf(path, PATH_SIZE, "%s/%s", cur, de->d_name); - j = 0; - for (i=0; id_name)) { + // We have an audio file, add it to the list + printf("Found audio file %s, adding as item %d\n", path, noitems); + contents[noitems++] = strdup(path); + printf("Next item is %d\n", noitems); + } + else { + printf("Skipping non-audio file %s\n", path); } } - n = j; + closedir(d); + + // Sort the directory contents via bubblesort (space efficient - + // everything else inefficient :-) + printf("Sorting directory contents\n"); + int sorted = 0; + while (!sorted) { + sorted = 1; + for (i = 0; i < noitems-1; i++) { + + // Create a copy of our two items to compare. If + // they start with a single digit by itself, then prepend + // a zero for alphanumeric comparison - we're guessing the + // filename must start with a track number and we'd like + // numbers < 10 to order correctly to be below numbers > 10. + char* fname1 = (char*) strrchr(contents[i], '/'); + char* fname2 = (char*) strrchr(contents[i+1], '/'); + fname1++; + fname2++; + + if (isdigit(*fname1) && !isdigit(*(fname1 + 1))) + sprintf(comp1, "0%s", fname1); + else + strcpy(comp1, fname1); + if (isdigit(*fname2) && !isdigit(*(fname2 + 1))) + sprintf(comp2, "0%s", fname2); + else + strcpy(comp2, fname2); + + if (strcmp(comp1, comp2) > 0) { + printf("SWAP: %s with %s\n", comp1, comp2); + char* tmp = contents[i]; + contents[i] = contents[i+1]; + contents[i+1] = tmp; + sorted = 0; + } + else { + printf("NOSWAP: %s with %s\n", comp1, comp2); + } + } + } + + // Append the sorted contents to our list of items + printf("Adding sorted contents to item list\n"); + for (i = 0; i < noitems; i++) { + + // If we've hit the limit of the playlist size, free up + // directory entries from now on as we can't reassign them + // to the playlist (where they would be freed) + if (*nextitem == MAX_PLAYLIST_ENTRIES) { + free(contents[i]); + continue; + } + + // Add the item to the playlist + item[*nextitem] = contents[i]; + printf("playlist item %d: %s\n", *nextitem, contents[i]); + (*nextitem)++; + + } + +} + +void +fb_shuffle(int shuffle) +{ + char **item, *tmp; + int i, j, k, n; + + if (shuffle) + mvpw_set_menu_title(playlist_widget, "Shuffle Play"); + else + mvpw_set_menu_title(playlist_widget, "Play All"); + + item = alloca(sizeof(char*) * MAX_PLAYLIST_ENTRIES); + // Recurse from the current directory and find all + // audio files + n = 0; + recurse_find_audio(cwd, item, &n); + if (n == 0) { - gui_error("No audio files exist in this directory."); + gui_error("No audio files exist in this directory or its subdirectories"); return; } if (shuffle && (n > 1)) { - for (i=0; i<1024; i++) { + for (i=0; i < MAX_PLAYLIST_ENTRIES; i++) { j = rand() % n; k = rand() % n; tmp = item[k]; @@ -580,7 +682,11 @@ fb_shuffle(int shuffle) mvpw_show(playlist_widget); mvpw_focus(playlist_widget); - playlist_create(item, n, cwd); + playlist_create(item, n); + + // Release the list of items + for (i = 0; i < n; i++) + free(item[i]); if (shuffle) mvpw_set_text_str(fb_name, "Shuffle Play"); diff --git a/src/mvpmc.h b/src/mvpmc.h index 1fc1d19..d0966ab 100644 --- a/src/mvpmc.h +++ b/src/mvpmc.h @@ -26,6 +26,13 @@ #define VIDEO_BUFF_SIZE (1024*96) /**< video input buffer size */ +/** Maximum number of playlist entries */ +#define MAX_PLAYLIST_ENTRIES 2048 + +/** Maximum size of a filepath */ +#define PATH_SIZE 256 + + /** * Portion of the mvpmc application which owns either the gui or * the audio/video playback hardware. @@ -161,9 +168,8 @@ struct playlist_struct { * Create a playlist. * \param item playlist item list * \param n number of items - * \param cwd basename for files in the playlist */ -extern void playlist_create(char **item, int n, char *cwd); +extern void playlist_create(char **item, int n); /** * Video playback functions for the current streaming method. diff --git a/src/playlist.c b/src/playlist.c index b1eee5b..2a16c1a 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -540,7 +540,7 @@ void playlist_clear(void) } } -void playlist_create(char **item, int n, char *cwd) +void playlist_create(char **item, int n) { int i; playlist_t *pl_head, *pl_prev, *pl; @@ -549,7 +549,7 @@ void playlist_create(char **item, int n, char *cwd) pthread_mutex_lock(&mutex); mvpw_clear_menu(playlist_widget); - playlist_repeat = 0; + playlist_repeat = 1; mvpw_check_menu_item(pl_menu, (void*)PL_REPEAT, playlist_repeat); pl_head = pl_prev = NULL; @@ -558,22 +558,46 @@ void playlist_create(char **item, int n, char *cwd) memset(pl, 0, sizeof(*pl)); if (pl_head == NULL) pl_head = pl; - pl->filename = malloc(strlen(item[i])+strlen(cwd)+2); + pl->filename = malloc(strlen(item[i])+1); snprintf(pl->filename, - strlen(item[i])+strlen(cwd)+2, - "%s/%s", cwd, item[i]); + strlen(item[i])+1, + "%s", item[i]); pl->key = (void*)i; pl->next = NULL; pl->prev = pl_prev; if (pl_prev) pl_prev->next = pl; pl_prev = pl; + + char* trackname = NULL; + + // Try and parse ID3 tag information (obviously, + // this fails for non-mp3 files) + ID3 *info; + info = create_ID3(NULL); + if (parse_file_ID3(info, (unsigned char*) item[i]) == 0) { + trackname = (char*) malloc(sizeof(char) * 1024); + snprintf(trackname, 1024, "%s - %s / %s (%s)", info->track, info->title, info->album, info->artist); + } + else { + // Fall back to the filename - no tag + char* filename = strrchr(item[i], '/'); + if (filename == NULL) + filename = item[i]; + else + filename++; + trackname = strdup(filename); + } + item_attr.select = select_callback; - mvpw_add_menu_item(playlist_widget, item[i], + mvpw_add_menu_item(playlist_widget, trackname, pl->key, &item_attr); if (pl->label) free(pl->label); - pl->label = strdup(item[i]); + pl->label = strdup(trackname); + + destroy_ID3(info); + free(trackname); } playlist_head = pl_head;