From 5e2752ae2c52235573a5424a7e3d5e87fcfe3707 Mon Sep 17 00:00:00 2001 From: waker Date: Mon, 14 Nov 2011 20:08:42 +0100 Subject: deleted legacy m3u and pls parsers; fixed bug in uri checker which was failing when uri didn't have '.' char in it --- playlist.c | 286 ++----------------------------------------------------------- 1 file changed, 7 insertions(+), 279 deletions(-) (limited to 'playlist.c') diff --git a/playlist.c b/playlist.c index b3d11f25..97ca652d 100644 --- a/playlist.c +++ b/playlist.c @@ -1206,265 +1206,6 @@ plt_insert_cue (playlist_t *plt, playItem_t *after, playItem_t *origin, int nums return plt_insert_cue_from_buffer (plt, after, origin, buf, sz, numsamples, samplerate); } -#if 0 -playItem_t * -plt_insert_m3u (playlist_t *plt, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) { - trace ("enter pl_insert_m3u\n"); - // skip all empty lines and comments - DB_FILE *fp = vfs_fopen (fname); - if (!fp) { - trace ("failed to open file %s\n", fname); - return NULL; - } - int sz = vfs_fgetlength (fp); - if (sz > 1024*1024) { - vfs_fclose (fp); - trace ("file %s is too large to be a playlist\n", fname); - return NULL; - } - trace ("loading m3u...\n"); - uint8_t buffer[sz]; - vfs_fread (buffer, 1, sz, fp); - vfs_fclose (fp); - const uint8_t *p = buffer; - const uint8_t *end = buffer+sz; - while (p < end) { - p = pl_str_skipspaces (p, end); - if (p >= end) { - break; - } - if (*p == '#') { - while (p < end && *p >= 0x20) { - p++; - } - if (p >= end) { - break; - } - continue; - } - const uint8_t *e = p; - while (e < end && *e >= 0x20) { - e++; - } - int n = e-p; - uint8_t nm[n+1]; - memcpy (nm, p, n); - nm[n] = 0; - trace ("pl_insert_m3u: adding file %s\n", nm); - playItem_t *it = plt_insert_file (plt, after, nm, pabort, cb, user_data); - if (it) { - after = it; - } - if (pabort && *pabort) { - return after; - } - p = e; - if (p >= end) { - break; - } - } - trace ("leave pl_insert_m3u\n"); - return after; -} - -// that has to be opened with vfs functions to allow loading from http, as -// referenced from M3U. -static playItem_t * -plt_insert_pls (playlist_t *playlist, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) { - DB_FILE *fp = vfs_fopen (fname); - if (!fp) { - trace ("failed to open file %s\n", fname); - return NULL; - } - int sz = vfs_fgetlength (fp); - if (sz > 1024*1024) { - vfs_fclose (fp); - trace ("file %s is too large to be a playlist\n", fname); - return NULL; - } - if (sz < 10) { - vfs_fclose (fp); - trace ("file %s is too small to be a playlist (%d)\n", fname, sz); - return NULL; - } - vfs_rewind (fp); - uint8_t buffer[sz]; - vfs_fread (buffer, 1, sz, fp); - vfs_fclose (fp); - // 1st line must be "[playlist]" - const uint8_t *p = buffer; - const uint8_t *end = buffer+sz; - if (strncasecmp (p, "[playlist]", 10)) { - trace ("file %s doesn't begin with [playlist]\n", fname); - return NULL; - } - p += 10; - p = pl_str_skipspaces (p, end); - if (p >= end) { - trace ("file %s finished before numberofentries had been read\n", fname); - return NULL; - } - // fetch all tracks - char url[1024] = ""; - char title[1024] = ""; - char length[20] = ""; - int lastidx = -1; - while (p < end) { - p = pl_str_skipspaces (p, end); - if (p >= end) { - break; - } - if (end-p < 6) { - break; - } - const uint8_t *e; - int n; - if (!strncasecmp (p, "numberofentries=", 16) || !strncasecmp (p, "version=", 8)) { - while (p < end && *p >= 0x20) { - p++; - } - continue; - } - else if (!strncasecmp (p, "file", 4)) { - int idx = atoi (p + 4); - if (url[0] && idx != lastidx && lastidx != -1) { - // add track - playItem_t *it = plt_insert_file (playlist, after, url, pabort, cb, user_data); - if (it) { - after = it; - plt_set_item_duration (playlist, it, atoi (length)); - if (title[0]) { - pl_delete_all_meta (it); - pl_add_meta (it, "title", title); - } - } - if (pabort && *pabort) { - return after; - } - url[0] = 0; - title[0] = 0; - length[0] = 0; - } - lastidx = idx; - p += 4; - while (p < end && *p != '=') { - p++; - } - p++; - if (p >= end) { - break; - } - e = p; - while (e < end && *e >= 0x20) { - e++; - } - n = e-p; - n = min (n, sizeof (url)-1); - memcpy (url, p, n); - url[n] = 0; - trace ("url: %s\n", url); - p = ++e; - } - else if (!strncasecmp (p, "title", 5)) { - int idx = atoi (p + 5); - if (url[0] && idx != lastidx && lastidx != -1) { - // add track - playItem_t *it = plt_insert_file (playlist, after, url, pabort, cb, user_data); - if (it) { - after = it; - plt_set_item_duration (playlist, it, atoi (length)); - if (title[0]) { - pl_delete_all_meta (it); - pl_add_meta (it, "title", title); - } - } - if (pabort && *pabort) { - return after; - } - url[0] = 0; - title[0] = 0; - length[0] = 0; - } - lastidx = idx; - p += 5; - while (p < end && *p != '=') { - p++; - } - p++; - if (p >= end) { - break; - } - e = p; - while (e < end && *e >= 0x20) { - e++; - } - n = e-p; - n = min (n, sizeof (title)-1); - memcpy (title, p, n); - title[n] = 0; - trace ("title: %s\n", title); - p = ++e; - } - else if (!strncasecmp (p, "length", 6)) { - int idx = atoi (p + 6); - if (url[0] && idx != lastidx && lastidx != -1) { - // add track - playItem_t *it = plt_insert_file (playlist, after, url, pabort, cb, user_data); - if (it) { - after = it; - if (title[0]) { - pl_delete_all_meta (it); - pl_add_meta (it, "title", title); - } - } - if (pabort && *pabort) { - return after; - } - url[0] = 0; - title[0] = 0; - length[0] = 0; - } - lastidx = idx; - p += 6; - // skip = - while (p < end && *p != '=') { - p++; - } - p++; - if (p >= end) { - break; - } - e = p; - while (e < end && *e >= 0x20) { - e++; - } - n = e-p; - n = min (n, sizeof (length)-1); - memcpy (length, p, n); - } - else { - trace ("invalid entry in pls file: %s\n", p); - break; - } - while (e < end && *e < 0x20) { - e++; - } - p = e; - } - if (url[0]) { - playItem_t *it = plt_insert_file (playlist, after, url, pabort, cb, user_data); - if (it) { - after = it; - if (title[0]) { - pl_delete_all_meta (it); - pl_add_meta (it, "title", title); - } - } - } - return after; -} -#endif - static int follow_symlinks = 0; static int ignore_archives = 0; @@ -1496,13 +1237,6 @@ plt_insert_file (playlist_t *playlist, playItem_t *after, const char *fname, int } } - // detect decoder - const char *eol = strrchr (fname, '.'); - if (!eol) { - return NULL; - } - eol++; - const char *fn = strrchr (fname, '/'); if (!fn) { fn = fname; @@ -1510,19 +1244,6 @@ plt_insert_file (playlist_t *playlist, playItem_t *after, const char *fname, int else { fn++; } -#if 0 - // detect pls/m3u files - // they must be handled before checking for http://, - // so that remote playlist files referenced from other playlist files could - // be loaded correctly - if (!strncmp (eol, "m3u", 3) || !strncmp (eol, "m3u8", 4)) { - return plt_insert_m3u (playlist, after, fname, pabort, cb, user_data); - } - else if (!strncmp (eol, "pls", 3)) { - - return plt_insert_pls (playlist, after, fname, pabort, cb, user_data); - } -#endif // add all posible streams as special-case: // set decoder to NULL, and filetype to "content" @@ -1587,6 +1308,13 @@ plt_insert_file (playlist_t *playlist, playItem_t *after, const char *fname, int fname += 7; } + // detect decoder + const char *eol = strrchr (fname, '.'); + if (!eol) { + return NULL; + } + eol++; + DB_decoder_t **decoders = plug_get_decoder_list (); // match by decoder for (int i = 0; decoders[i]; i++) { -- cgit v1.2.3 From 8296eb1ea66d09faadbd99de522258b92a8f5869 Mon Sep 17 00:00:00 2001 From: waker Date: Fri, 18 Nov 2011 21:42:14 +0100 Subject: added album artist support to shuffle albums mode --- playlist.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) (limited to 'playlist.c') diff --git a/playlist.c b/playlist.c index 97ca652d..181a68be 100644 --- a/playlist.c +++ b/playlist.c @@ -1653,7 +1653,24 @@ plt_insert_item (playlist_t *playlist, playItem_t *after, playItem_t *it) { // shuffle playItem_t *prev = it->prev[PL_MAIN]; - if (pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS && prev && pl_find_meta_raw (prev, "album") == pl_find_meta_raw (it, "album") && pl_find_meta_raw (prev, "artist") == pl_find_meta_raw (it, "artist")) { + const char *aa = NULL, *prev_aa = NULL; + if (prev) { + aa = pl_find_meta_raw (it, "band"); + if (!aa) { + aa = pl_find_meta_raw (it, "album artist"); + } + if (!aa) { + aa = pl_find_meta_raw (it, "albumartist"); + } + prev_aa = pl_find_meta_raw (prev, "band"); + if (!prev_aa) { + prev_aa = pl_find_meta_raw (prev, "album artist"); + } + if (!prev_aa) { + prev_aa = pl_find_meta_raw (prev, "albumartist"); + } + } + if (pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS && prev && pl_find_meta_raw (prev, "album") == pl_find_meta_raw (it, "album") && ((aa && prev_aa && aa == prev_aa) || pl_find_meta_raw (prev, "artist") == pl_find_meta_raw (it, "artist"))) { it->shufflerating = prev->shufflerating; } else { @@ -2458,8 +2475,17 @@ plt_reshuffle (playlist_t *playlist, playItem_t **ppmin, playItem_t **ppmax) { playItem_t *prev = NULL; const char *alb = NULL; const char *art = NULL; + const char *aa = NULL; for (playItem_t *it = playlist->head[PL_MAIN]; it; it = it->next[PL_MAIN]) { - if (pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS && prev && alb == pl_find_meta_raw (it, "album") && art == pl_find_meta_raw (it, "artist")) { + const char *new_aa = NULL; + new_aa = pl_find_meta_raw (it, "band"); + if (!new_aa) { + new_aa = pl_find_meta_raw (it, "album artist"); + } + if (!new_aa) { + new_aa = pl_find_meta_raw (it, "albumartist"); + } + if (pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS && prev && alb == pl_find_meta_raw (it, "album") && ((aa && new_aa && aa == new_aa) || art == pl_find_meta_raw (it, "artist"))) { it->shufflerating = prev->shufflerating; } else { @@ -2467,6 +2493,7 @@ plt_reshuffle (playlist_t *playlist, playItem_t **ppmin, playItem_t **ppmax) { it->shufflerating = rand (); alb = pl_find_meta_raw (it, "album"); art = pl_find_meta_raw (it, "artist"); + aa = new_aa; } if (!pmin || it->shufflerating < pmin->shufflerating) { pmin = it; @@ -3185,6 +3212,9 @@ plt_reset_cursor (playlist_t *playlist) { float plt_get_totaltime (playlist_t *playlist) { + if (!playlist) { + return 0; + } return playlist->totaltime; } -- cgit v1.2.3 From 088d8259a2dac2bd89fd1ad958d69ee0a46953df Mon Sep 17 00:00:00 2001 From: waker Date: Sat, 26 Nov 2011 15:22:50 +0100 Subject: allow blank values in config variables --- conf.c | 4 ---- playlist.c | 1 - 2 files changed, 5 deletions(-) (limited to 'playlist.c') diff --git a/conf.c b/conf.c index f875d349..6d82f805 100644 --- a/conf.c +++ b/conf.c @@ -89,10 +89,6 @@ conf_load (void) { while (*p && *p <= 0x20) { p++; } - if (!*p) { - fprintf (stderr, "error in config file line %d\n", line); - continue; - } char *value = p; // remove trailing trash while (*p && *p >= 0x20) { diff --git a/playlist.c b/playlist.c index 181a68be..ec30b03d 100644 --- a/playlist.c +++ b/playlist.c @@ -2388,7 +2388,6 @@ pl_load_all (void) { char path[1024]; DB_conf_item_t *it = conf_find ("playlist.tab.", NULL); if (!it) { -// fprintf (stderr, "INFO: loading legacy default playlist\n"); // legacy (0.3.3 and earlier) char defpl[1024]; // $HOME/.config/deadbeef/default.dbpl if (snprintf (defpl, sizeof (defpl), "%s/default.dbpl", dbconfdir) > sizeof (defpl)) { -- cgit v1.2.3 From 67e3d2ed92c14feeb53ed222dd297681f9824545 Mon Sep 17 00:00:00 2001 From: waker Date: Sat, 26 Nov 2011 16:59:30 +0100 Subject: title formatting: added %L %X %Z for 'selected playback length', 'selected track count', and 'current channel configuration' respectively --- playlist.c | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) (limited to 'playlist.c') diff --git a/playlist.c b/playlist.c index ec30b03d..5b950cc1 100644 --- a/playlist.c +++ b/playlist.c @@ -2705,9 +2705,7 @@ pl_format_elapsed (const char *ret, char *elapsed, int size) { // @escape_chars: list of escapable characters terminated with 0, or NULL if none static int pl_format_title_int (const char *escape_chars, playItem_t *it, int idx, char *s, int size, int id, const char *fmt) { - char dur[50]; - char elp[50]; - char fno[50]; + char tmp[50]; char tags[200]; char dirname[PATH_MAX]; const char *duration = NULL; @@ -2723,8 +2721,8 @@ pl_format_title_int (const char *escape_chars, playItem_t *it, int idx, char *s, if (idx == -1) { idx = pl_get_idx_of (it); } - snprintf (fno, sizeof (fno), "%d", idx+1); - text = fno; + snprintf (tmp, sizeof (tmp), "%d", idx+1); + text = tmp; break; case DB_COLUMN_PLAYING: UNLOCK; @@ -2848,8 +2846,8 @@ pl_format_title_int (const char *escape_chars, playItem_t *it, int idx, char *s, p++; } if (!(*p)) { - snprintf (fno, sizeof (fno), "%02d", atoi (meta)); - meta = fno; + snprintf (tmp, sizeof (tmp), "%02d", atoi (meta)); + meta = tmp; } } } @@ -2869,7 +2867,7 @@ pl_format_title_int (const char *escape_chars, playItem_t *it, int idx, char *s, meta = pl_find_meta_raw (it, "copyright"); } else if (*fmt == 'l') { - const char *value = (duration = pl_format_duration (it, duration, dur, sizeof (dur))); + const char *value = (duration = pl_format_duration (it, duration, tmp, sizeof (tmp))); while (n > 0 && *value) { *s++ = *value++; n--; @@ -2877,7 +2875,7 @@ pl_format_title_int (const char *escape_chars, playItem_t *it, int idx, char *s, } else if (*fmt == 'e') { // what a hack.. - const char *value = (elapsed = pl_format_elapsed (elapsed, elp, sizeof (elp))); + const char *value = (elapsed = pl_format_elapsed (elapsed, tmp, sizeof (tmp))); while (n > 0 && *value) { *s++ = *value++; n--; @@ -2981,6 +2979,36 @@ pl_format_title_int (const char *escape_chars, playItem_t *it, int idx, char *s, meta = dirname; } } + else if (*fmt == 'L') { + float l = 0; + for (playItem_t *it = playlist->head[PL_MAIN]; it; it = it->next[PL_MAIN]) { + if (it->selected) { + l += it->_duration; + } + } + pl_format_time (l, tmp, sizeof(tmp)); + meta = tmp; + } + else if (*fmt == 'X') { + int n = 0; + for (playItem_t *it = playlist->head[PL_MAIN]; it; it = it->next[PL_MAIN]) { + if (it->selected) { + n++; + } + } + snprintf (tmp, sizeof (tmp), "%d", n); + meta = tmp; + } + else if (*fmt == 'Z') { + DB_fileinfo_t *c = deadbeef->streamer_get_current_fileinfo (); // FIXME: might crash streamer + if (c->fmt.channels <= 2) { + meta = c->fmt.channels == 1 ? _("Mono") : _("Stereo"); + } + else { + snprintf (tmp, sizeof (tmp), "%dch Multichannel", c->fmt.channels); + meta = tmp; + } + } else if (*fmt == 'V') { meta = VERSION; } -- cgit v1.2.3 From 204f39c855a62d6b9239716eec4a37fb81fcd624 Mon Sep 17 00:00:00 2001 From: waker Date: Sun, 27 Nov 2011 12:49:46 +0100 Subject: fixed clearing playqueue on exit --- main.c | 6 +++--- playlist.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'playlist.c') diff --git a/main.c b/main.c index 91b7b145..ee1007a2 100644 --- a/main.c +++ b/main.c @@ -426,6 +426,7 @@ player_mainloop (void) { conf_save (); break; case DB_EV_TERMINATE: + pl_playqueue_clear (); term = 1; break; case DB_EV_PLAY_CURRENT: @@ -883,6 +884,7 @@ main (int argc, char *argv[]) { server_tid = thread_start (server_loop, NULL); // this runs in main thread (blocks right here) player_mainloop (); + // terminate server and wait for completion if (server_tid) { server_terminate = 1; @@ -924,9 +926,7 @@ main (int argc, char *argv[]) { conf_free (); messagepump_free (); plug_cleanup (); -#if 0 - sigterm_handled = 1; -#endif + fprintf (stderr, "hej-hej!\n"); return 0; } diff --git a/playlist.c b/playlist.c index 5b950cc1..fc1cd4bb 100644 --- a/playlist.c +++ b/playlist.c @@ -3569,6 +3569,7 @@ pl_playqueue_clear (void) { } for (i = 0; i < cnt; i++) { pl_item_unref (playqueue[i]); + playqueue[i] = NULL; } UNLOCK; } -- cgit v1.2.3 From 002eaf676642e3df01b98d2d495c2aff30573553 Mon Sep 17 00:00:00 2001 From: waker Date: Thu, 29 Dec 2011 12:03:47 +0100 Subject: fixed filehandle leak in plt_load; fixed error when loading playlist from URI --- playlist.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'playlist.c') diff --git a/playlist.c b/playlist.c index fc1cd4bb..b1c9d319 100644 --- a/playlist.c +++ b/playlist.c @@ -2107,15 +2107,10 @@ pl_save_all (void) { playItem_t * plt_load (playlist_t *plt, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) { - FILE *fp = fopen (fname, "rb"); - if (!fp) { - trace ("plt_load: failed to open %s\n", fname); - return NULL; - } - // try plugins 1st const char *ext = strrchr (fname, '.'); if (ext) { + trace ("finding playlist plugin for %s\n", ext); ext++; DB_playlist_t **plug = plug_get_playlist_list (); int p, e; @@ -2129,6 +2124,12 @@ plt_load (playlist_t *plt, playItem_t *after, const char *fname, int *pabort, in } } trace ("plt_load: loading dbpl\n"); + FILE *fp = fopen (fname, "rb"); + if (!fp) { + trace ("plt_load: failed to open %s\n", fname); + return NULL; + } + uint8_t majorver; uint8_t minorver; -- cgit v1.2.3 From d232352925df36cf31280bbff9c773145826a4fd Mon Sep 17 00:00:00 2001 From: waker Date: Sun, 8 Jan 2012 21:09:36 +0100 Subject: added hack for loading playlists from zip files --- playlist.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'playlist.c') diff --git a/playlist.c b/playlist.c index b1c9d319..e1ae14f4 100644 --- a/playlist.c +++ b/playlist.c @@ -1402,6 +1402,10 @@ plt_insert_dir_int (playlist_t *playlist, DB_vfs_t *vfs, playItem_t *after, cons } else { inserted = plt_insert_file (playlist, after, namelist[i]->d_name, pabort, cb, user_data); + if (!inserted) { + // special case for loading playlists in zip files + inserted = plt_load (playlist, after, namelist[i]->d_name, pabort, cb, user_data); + } } if (inserted) { after = inserted; -- cgit v1.2.3 From db7c0834faae943816f41d9c8ef7260d7a7af929 Mon Sep 17 00:00:00 2001 From: waker Date: Thu, 2 Feb 2012 20:52:10 +0100 Subject: added a few missing returns --- configure.ac | 1 - junklib.c | 1 + playlist.c | 4 +++- plugins/gtkui/ddbvolumebar.c | 1 + plugins/gtkui/trkproperties.c | 1 + streamer.c | 1 + 6 files changed, 7 insertions(+), 2 deletions(-) (limited to 'playlist.c') diff --git a/configure.ac b/configure.ac index 9e2b179d..4513db87 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,6 @@ AC_SUBST(YASM_FLAGS) test "x$prefix" = xNONE && prefix=$ac_default_prefix - dnl INSANE_CFLAGS="-Wformat -Wdisabled-optimization -Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits -Wbad-function-cast" dnl INSANE_CXXFLAGS="-Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits" diff --git a/junklib.c b/junklib.c index ed0c203f..fe9a6dc3 100644 --- a/junklib.c +++ b/junklib.c @@ -1130,6 +1130,7 @@ junk_apev2_add_frame (playItem_t *it, DB_apev2_tag_t *tag_store, DB_apev2_frame_ } } } + return 0; } int diff --git a/playlist.c b/playlist.c index e1ae14f4..a2a25311 100644 --- a/playlist.c +++ b/playlist.c @@ -1816,8 +1816,9 @@ plt_delete_selected (playlist_t *playlist) { int pl_delete_selected (void) { LOCK; - plt_delete_selected (playlist); + int ret = plt_delete_selected (playlist); UNLOCK; + return ret; } void @@ -2581,6 +2582,7 @@ pl_get_item_replaygain (playItem_t *it, int idx) { case DDB_REPLAYGAIN_TRACKPEAK: return pl_find_meta_float (it, rg_keys[idx], 1); } + return 0; } int diff --git a/plugins/gtkui/ddbvolumebar.c b/plugins/gtkui/ddbvolumebar.c index 732210f3..4d98cb05 100644 --- a/plugins/gtkui/ddbvolumebar.c +++ b/plugins/gtkui/ddbvolumebar.c @@ -185,6 +185,7 @@ volumebar_draw (GtkWidget *widget, cairo_t *cr) { gboolean on_volumebar_draw (GtkWidget *widget, cairo_t *cr) { volumebar_draw (widget, cr); + return FALSE; } #if !GTK_CHECK_VERSION(3,0,0) diff --git a/plugins/gtkui/trkproperties.c b/plugins/gtkui/trkproperties.c index c6c704c9..d575c759 100644 --- a/plugins/gtkui/trkproperties.c +++ b/plugins/gtkui/trkproperties.c @@ -494,6 +494,7 @@ set_progress_cb (void *ctx) { const char *fname = deadbeef->pl_find_meta_raw (track, ":URI"); gtk_entry_set_text (GTK_ENTRY (progressitem), fname); deadbeef->pl_item_unref (track); + return FALSE; } static void diff --git a/streamer.c b/streamer.c index ad5b9a04..267e5e42 100644 --- a/streamer.c +++ b/streamer.c @@ -1780,6 +1780,7 @@ streamer_set_output_format (void) { return -1; } } + return 0; } // decodes data and converts to current output format -- cgit v1.2.3 From 66a3220170c736b4d6341f403626cfa0caeef702 Mon Sep 17 00:00:00 2001 From: waker Date: Sun, 11 Mar 2012 11:41:33 +0100 Subject: fixed minor cue parsing bug --- playlist.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'playlist.c') diff --git a/playlist.c b/playlist.c index a2a25311..7f099775 100644 --- a/playlist.c +++ b/playlist.c @@ -1117,20 +1117,18 @@ plt_insert_cue_from_buffer (playlist_t *playlist, playItem_t *after, playItem_t // fprintf (stderr, "got unknown line:\n%s\n", p); } } - if (!title[0]) { - UNLOCK; - return NULL; - } - // handle last track - playItem_t *it = plt_process_cue_track (playlist, pl_find_meta_raw (origin, ":URI"), &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, pl_find_meta_raw (origin, ":DECODER"), filetype, samplerate); - if (it) { - trace ("last track endsample: %d\n", numsamples-1); - it->endsample = numsamples-1; - if (it->endsample >= numsamples || it->startsample >= numsamples) { - goto error; + if (title[0]) { + // handle last track + playItem_t *it = plt_process_cue_track (playlist, pl_find_meta_raw (origin, ":URI"), &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, pl_find_meta_raw (origin, ":DECODER"), filetype, samplerate); + if (it) { + trace ("last track endsample: %d\n", numsamples-1); + it->endsample = numsamples-1; + if (it->endsample >= numsamples || it->startsample >= numsamples) { + goto error; + } + plt_set_item_duration (playlist, it, (float)(it->endsample - it->startsample + 1) / samplerate); + cuetracks[ncuetracks++] = it; } - plt_set_item_duration (playlist, it, (float)(it->endsample - it->startsample + 1) / samplerate); - cuetracks[ncuetracks++] = it; } if (!ncuetracks) { @@ -1161,6 +1159,7 @@ plt_insert_cue_from_buffer (playlist_t *playlist, playItem_t *after, playItem_t UNLOCK; return after; error: + trace ("cue parsing error occured\n"); for (int i = 0; i < ncuetracks; i++) { pl_item_unref (cuetracks[i]); } -- cgit v1.2.3 From 9b6157850331f681404ddd5e965b8c42b547d92a Mon Sep 17 00:00:00 2001 From: waker Date: Sat, 24 Mar 2012 11:10:59 +0100 Subject: updated (c) year to 2012 in the sources --- PORTABLE_VERSION | 2 +- about.txt | 2 +- common.h | 2 +- conf.c | 2 +- conf.h | 2 +- deadbeef.h | 3 ++- dsppreset.c | 2 +- dsppreset.h | 2 +- junklib.c | 2 +- junklib.h | 2 +- main.c | 4 ++-- messagepump.c | 2 +- messagepump.h | 2 +- metacache.c | 2 +- metacache.h | 2 +- optmath.h | 2 +- playlist.c | 2 +- playlist.h | 2 +- plmeta.c | 2 +- pltmeta.c | 2 +- pltmeta.h | 2 +- plugins.c | 2 +- plugins.h | 2 +- plugins/aac/aac.c | 4 ++-- plugins/aac/aac_parser.c | 2 +- plugins/aac/aac_parser.h | 2 +- plugins/adplug/adplug-db.cpp | 2 +- plugins/adplug/plugin.c | 4 ++-- plugins/alsa/alsa.c | 4 ++-- plugins/ao/plugin.c | 4 ++-- plugins/artwork/albumartorg.c | 2 +- plugins/artwork/albumartorg.h | 2 +- plugins/artwork/artwork.c | 2 +- plugins/artwork/escape.h | 2 +- plugins/artwork/lastfm.h | 2 +- plugins/cdda/cdda.c | 2 +- plugins/converter/converter.c | 4 ++-- plugins/converter/converter.h | 2 +- plugins/converter/convgui.c | 4 ++-- plugins/dca/dcaplug.c | 4 ++-- plugins/dsp_libsrc/src.c | 4 ++-- plugins/dsp_libsrc/src.h | 2 +- plugins/dumb/cdumb.c | 4 ++-- plugins/ffap/ffap.c | 4 ++-- plugins/ffmpeg/ffmpeg.c | 4 ++-- plugins/flac/flac.c | 4 ++-- plugins/gme/cgme.c | 4 ++-- plugins/gtkui/actions.c | 2 +- plugins/gtkui/actions.h | 2 +- plugins/gtkui/callbacks.c | 2 +- plugins/gtkui/callbacks.h | 2 +- plugins/gtkui/coverart.c | 2 +- plugins/gtkui/coverart.h | 2 +- plugins/gtkui/ddblistview.c | 2 +- plugins/gtkui/ddblistview.h | 2 +- plugins/gtkui/ddbtabstrip.c | 2 +- plugins/gtkui/ddbtabstrip.h | 2 +- plugins/gtkui/ddbvolumebar.c | 2 +- plugins/gtkui/ddbvolumebar.h | 2 +- plugins/gtkui/drawing.h | 2 +- plugins/gtkui/dspconfig.c | 2 +- plugins/gtkui/dspconfig.h | 2 +- plugins/gtkui/eq.c | 2 +- plugins/gtkui/eq.h | 2 +- plugins/gtkui/gdkdrawing.c | 2 +- plugins/gtkui/gtkui.c | 4 ++-- plugins/gtkui/gtkui.h | 2 +- plugins/gtkui/gtkui_api.h | 2 +- plugins/gtkui/mainplaylist.c | 2 +- plugins/gtkui/mainplaylist.h | 2 +- plugins/gtkui/parser.c | 2 +- plugins/gtkui/parser.h | 2 +- plugins/gtkui/plcommon.c | 2 +- plugins/gtkui/plcommon.h | 2 +- plugins/gtkui/pluginconf.c | 2 +- plugins/gtkui/pluginconf.h | 2 +- plugins/gtkui/prefwin.c | 2 +- plugins/gtkui/progress.c | 2 +- plugins/gtkui/progress.h | 2 +- plugins/gtkui/search.c | 2 +- plugins/gtkui/search.h | 2 +- plugins/gtkui/tagwritersettings.c | 2 +- plugins/gtkui/tagwritersettings.h | 2 +- plugins/gtkui/timeline.c | 2 +- plugins/gtkui/timeline.h | 2 +- plugins/gtkui/trkproperties.c | 2 +- plugins/gtkui/trkproperties.h | 2 +- plugins/gtkui/wingeom.c | 2 +- plugins/gtkui/wingeom.h | 2 +- plugins/hotkeys/hotkeys.c | 2 +- plugins/hotkeys/hotkeys.h | 2 +- plugins/lastfm/lastfm.c | 4 ++-- plugins/m3u/m3u.c | 4 ++-- plugins/mms/mmsplug.c | 4 ++-- plugins/mono2stereo/mono2stereo.c | 4 ++-- plugins/mpgmad/mpgmad.c | 4 ++-- plugins/musepack/musepack.c | 4 ++-- plugins/notify/notify.c | 4 ++-- plugins/nullout/nullout.c | 4 ++-- plugins/oss/oss.c | 4 ++-- plugins/pulse/pulse.c | 4 ++-- plugins/shellexec/shellexec.c | 4 ++-- plugins/shn/shn.c | 4 ++-- plugins/sid/csid.cpp | 2 +- plugins/sid/csid.h | 2 +- plugins/sid/plugin.c | 4 ++-- plugins/sndfile/sndfile.c | 4 ++-- plugins/soundtouch/plugin.c | 4 ++-- plugins/soundtouch/st.cpp | 2 +- plugins/soundtouch/st.h | 2 +- plugins/supereq/Equ.cpp | 2 +- plugins/supereq/Equ.h | 2 +- plugins/supereq/supereq.c | 4 ++-- plugins/tta/ttaplug.c | 4 ++-- plugins/uade2/plugin.c | 2 +- plugins/vfs_curl/vfs_curl.c | 4 ++-- plugins/vfs_zip/vfs_zip.c | 4 ++-- plugins/vorbis/vorbis.c | 4 ++-- plugins/vtx/vtx.c | 4 ++-- plugins/wildmidi/wildmidiplug.c | 4 ++-- premix.c | 2 +- premix.h | 2 +- replaygain.c | 2 +- replaygain.h | 2 +- ringbuf.c | 2 +- ringbuf.h | 2 +- shortlicense | 2 +- streamer.c | 2 +- streamer.h | 2 +- threading.h | 2 +- threading_pthread.c | 2 +- tools/pluginfo/pluginfo.c | 2 +- utf8.c | 2 +- utf8.h | 2 +- vfs.c | 2 +- vfs.h | 2 +- vfs_stdio.c | 4 ++-- volume.c | 2 +- volume.h | 2 +- 139 files changed, 178 insertions(+), 177 deletions(-) (limited to 'playlist.c') diff --git a/PORTABLE_VERSION b/PORTABLE_VERSION index 5b5cff9c..cb0c939a 100644 --- a/PORTABLE_VERSION +++ b/PORTABLE_VERSION @@ -1 +1 @@ -0.5.2-rc2 +0.5.2 diff --git a/about.txt b/about.txt index 56ce845c..05423602 100644 --- a/about.txt +++ b/about.txt @@ -1,5 +1,5 @@ DeaDBeeF - ultimate music player for GNU/Linux systems with X11 -Copyright © 2009-2011 Alexey Yakovenko +Copyright © 2009-2012 Alexey Yakovenko http://deadbeef.sf.net This program is free software; you can redistribute it and/or diff --git a/common.h b/common.h index 6b5fc743..39355685 100644 --- a/common.h +++ b/common.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/conf.c b/conf.c index 6d82f805..d4e0ee28 100644 --- a/conf.c +++ b/conf.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/conf.h b/conf.h index c20c01cc..d767f691 100644 --- a/conf.h +++ b/conf.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/deadbeef.h b/deadbeef.h index bd3e4ffa..eb02603e 100644 --- a/deadbeef.h +++ b/deadbeef.h @@ -2,7 +2,7 @@ deadbeef.h -- plugin API of the DeaDBeeF audio player http://deadbeef.sourceforge.net - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -61,6 +61,7 @@ extern "C" { // api version history: // 9.9 -- devel +// 1.2 -- deadbeef-0.5.2 // 1.1 -- deadbeef-0.5.1 // adds pass_through method to dsp plugins for optimization purposes // 1.0 -- deadbeef-0.5.0 diff --git a/dsppreset.c b/dsppreset.c index 840a7b29..821f97ea 100644 --- a/dsppreset.c +++ b/dsppreset.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dsppreset.h b/dsppreset.h index 37354f9f..343dcf37 100644 --- a/dsppreset.h +++ b/dsppreset.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/junklib.c b/junklib.c index fe9a6dc3..a23cea65 100644 --- a/junklib.c +++ b/junklib.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/junklib.h b/junklib.h index 1733620b..0cd3b275 100644 --- a/junklib.h +++ b/junklib.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/main.c b/main.c index 74873a50..b4005e17 100644 --- a/main.c +++ b/main.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -780,7 +780,7 @@ main (int argc, char *argv[]) { return 0; } else if (!strcmp (argv[i], "--version")) { - fprintf (stdout, "DeaDBeeF " VERSION " Copyright © 2009-2011 Alexey Yakovenko\n"); + fprintf (stdout, "DeaDBeeF " VERSION " Copyright © 2009-2012 Alexey Yakovenko\n"); return 0; } else if (!strcmp (argv[i], "--gui")) { diff --git a/messagepump.c b/messagepump.c index 4f610a89..c7290f88 100644 --- a/messagepump.c +++ b/messagepump.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/messagepump.h b/messagepump.h index b044b72c..8a7abeee 100644 --- a/messagepump.h +++ b/messagepump.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/metacache.c b/metacache.c index e7fa1619..e5ba608a 100644 --- a/metacache.c +++ b/metacache.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/metacache.h b/metacache.h index 50c5cb7f..79432ddd 100644 --- a/metacache.h +++ b/metacache.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/optmath.h b/optmath.h index c655fd17..358629ca 100644 --- a/optmath.h +++ b/optmath.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/playlist.c b/playlist.c index 7f099775..d339d1ac 100644 --- a/playlist.c +++ b/playlist.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/playlist.h b/playlist.h index a517930b..f5cca51f 100644 --- a/playlist.h +++ b/playlist.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plmeta.c b/plmeta.c index 6f667a89..cf17f341 100644 --- a/plmeta.c +++ b/plmeta.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/pltmeta.c b/pltmeta.c index e141a743..e2e6cd04 100644 --- a/pltmeta.c +++ b/pltmeta.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/pltmeta.h b/pltmeta.h index ca781b87..e34a2a56 100644 --- a/pltmeta.h +++ b/pltmeta.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins.c b/plugins.c index a83fb64c..011fa2f9 100644 --- a/plugins.c +++ b/plugins.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins.h b/plugins.h index 9ee703e9..eb979c61 100644 --- a/plugins.h +++ b/plugins.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/aac/aac.c b/plugins/aac/aac.c index 4637be71..8a786b98 100644 --- a/plugins/aac/aac.c +++ b/plugins/aac/aac.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1412,7 +1412,7 @@ static DB_decoder_t plugin = { .plugin.name = "AAC player", .plugin.descr = "plays aac files, supports raw aac files, as well as mp4 container", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Uses modified libmp4ff (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com\n" "\n" diff --git a/plugins/aac/aac_parser.c b/plugins/aac/aac_parser.c index ea274989..81338cd0 100644 --- a/plugins/aac/aac_parser.c +++ b/plugins/aac/aac_parser.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/aac/aac_parser.h b/plugins/aac/aac_parser.h index 7d3b886e..fa1d4120 100644 --- a/plugins/aac/aac_parser.h +++ b/plugins/aac/aac_parser.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/adplug/adplug-db.cpp b/plugins/adplug/adplug-db.cpp index f6936ff6..2e97d1ca 100644 --- a/plugins/adplug/adplug-db.cpp +++ b/plugins/adplug/adplug-db.cpp @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/adplug/plugin.c b/plugins/adplug/plugin.c index 3c800b22..c9173d3b 100644 --- a/plugins/adplug/plugin.c +++ b/plugins/adplug/plugin.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -54,7 +54,7 @@ DB_decoder_t adplug_plugin = { .plugin.name = "Adplug player", .plugin.descr = "Adplug player (ADLIB OPL2/OPL3 emulator)", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Uses modified AdPlug library\n" "Copyright (C) 1999 - 2010 Simon Peter, et al.\n" diff --git a/plugins/alsa/alsa.c b/plugins/alsa/alsa.c index 0cc458db..3ea17435 100644 --- a/plugins/alsa/alsa.c +++ b/plugins/alsa/alsa.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -779,7 +779,7 @@ static DB_output_t plugin = { .plugin.name = "ALSA output plugin", .plugin.descr = "plays sound through linux standard alsa library", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/ao/plugin.c b/plugins/ao/plugin.c index af376e66..2239d995 100644 --- a/plugins/ao/plugin.c +++ b/plugins/ao/plugin.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -353,7 +353,7 @@ static DB_decoder_t plugin = { .plugin.name = "PSF player using Audio Overload SDK", .plugin.descr = "plays psf, psf2, spu, ssf, dsf, qsf file formats", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Uses modified aosdk-1.4.8 - library for playing .PSF (Sony PlayStation), .SPU (Sony PlayStation), .PSF2 (Sony PlayStation 2), .SSF (Sega Saturn), .DSF (Sega Dreamcast), and .QSF (Capcom QSound) audio file formats,\n" "http://rbelmont.mameworld.info/?page_id=221\n" diff --git a/plugins/artwork/albumartorg.c b/plugins/artwork/albumartorg.c index 51ca54cb..c07bb82c 100644 --- a/plugins/artwork/albumartorg.c +++ b/plugins/artwork/albumartorg.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/artwork/albumartorg.h b/plugins/artwork/albumartorg.h index 49231b04..c561b4f7 100644 --- a/plugins/artwork/albumartorg.h +++ b/plugins/artwork/albumartorg.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/artwork/artwork.c b/plugins/artwork/artwork.c index a604b87e..47aaf748 100644 --- a/plugins/artwork/artwork.c +++ b/plugins/artwork/artwork.c @@ -1417,7 +1417,7 @@ static DB_artwork_plugin_t plugin = { .plugin.plugin.name = "Album Artwork", .plugin.plugin.descr = "Loads album artwork either from local directories or from internet", .plugin.plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "Copyright (C) 2009-2011 Viktor Semykin \n" "\n" "This program is free software; you can redistribute it and/or\n" diff --git a/plugins/artwork/escape.h b/plugins/artwork/escape.h index 75d24091..e23421a2 100644 --- a/plugins/artwork/escape.h +++ b/plugins/artwork/escape.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/artwork/lastfm.h b/plugins/artwork/lastfm.h index cef71919..b5c12b8b 100644 --- a/plugins/artwork/lastfm.h +++ b/plugins/artwork/lastfm.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/cdda/cdda.c b/plugins/cdda/cdda.c index c26daac7..05ea508f 100644 --- a/plugins/cdda/cdda.c +++ b/plugins/cdda/cdda.c @@ -633,7 +633,7 @@ static DB_decoder_t plugin = { .plugin.name = "Audio CD player", .plugin.descr = "Audio CD plugin using libcdio and libcddb", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "Copyright (C) 2009-2011 Viktor Semykin \n" "\n" "This program is free software; you can redistribute it and/or\n" diff --git a/plugins/converter/converter.c b/plugins/converter/converter.c index 5befe1e6..2dff2f49 100644 --- a/plugins/converter/converter.c +++ b/plugins/converter/converter.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1092,7 +1092,7 @@ static ddb_converter_t plugin = { .misc.plugin.descr = "Converts any supported formats to other formats.\n" "Requires separate GUI plugin, e.g. Converter GTK UI\n", .misc.plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/converter/converter.h b/plugins/converter/converter.h index d58c5b0b..19e3d172 100644 --- a/plugins/converter/converter.h +++ b/plugins/converter/converter.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/converter/convgui.c b/plugins/converter/convgui.c index b76cc7c0..64000aee 100644 --- a/plugins/converter/convgui.c +++ b/plugins/converter/convgui.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1292,7 +1292,7 @@ DB_misc_t plugin = { " Reload DSP and encoder presets on every converter access\n" " Write 0 wave data size into waveheader when using pipe, for oggenc compatibility\n", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/dca/dcaplug.c b/plugins/dca/dcaplug.c index af19290b..85a04df6 100644 --- a/plugins/dca/dcaplug.c +++ b/plugins/dca/dcaplug.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -730,7 +730,7 @@ static DB_decoder_t plugin = { .plugin.name = "dts decoder", .plugin.descr = "plays dts-encoded files using libdca from VLC project", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Uses modified libdca from VLC Player project,\n" "developed by Gildas Bazin " diff --git a/plugins/dsp_libsrc/src.c b/plugins/dsp_libsrc/src.c index d759861a..f6cef816 100644 --- a/plugins/dsp_libsrc/src.c +++ b/plugins/dsp_libsrc/src.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -285,7 +285,7 @@ static DB_dsp_t plugin = { .plugin.name = "Resampler (Secret Rabbit Code)", .plugin.descr = "High quality samplerate converter using libsamplerate, http://www.mega-nerd.com/SRC/", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/dsp_libsrc/src.h b/plugins/dsp_libsrc/src.h index 9b7edcef..89c1bc58 100644 --- a/plugins/dsp_libsrc/src.h +++ b/plugins/dsp_libsrc/src.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/dumb/cdumb.c b/plugins/dumb/cdumb.c index 0ae7f4d4..26e6fa69 100644 --- a/plugins/dumb/cdumb.c +++ b/plugins/dumb/cdumb.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -886,7 +886,7 @@ static DB_decoder_t plugin = { .plugin.name = "DUMB module player", .plugin.descr = "module player based on DUMB library", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Uses a fork of DUMB (Dynamic Universal Music Bibliotheque), Version 0.9.3\n" "Copyright (C) 2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere\n" diff --git a/plugins/ffap/ffap.c b/plugins/ffap/ffap.c index ccfa2b2d..c2ba7cbd 100644 --- a/plugins/ffap/ffap.c +++ b/plugins/ffap/ffap.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko based on apedec from FFMpeg Copyright (c) 2007 Benjamin Zores based upon libdemac from Dave Chapman. @@ -1870,7 +1870,7 @@ static DB_decoder_t plugin = { .plugin.name = "Monkey's Audio (APE) decoder", .plugin.descr = "APE player based on code from libavc and rockbox", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "based on apedec from FFMpeg Copyright (c) 2007 Benjamin Zores \n" "based upon libdemac from Dave Chapman.\n" diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c index 557056eb..9cf6e0c5 100644 --- a/plugins/ffmpeg/ffmpeg.c +++ b/plugins/ffmpeg/ffmpeg.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -815,7 +815,7 @@ static DB_decoder_t plugin = { .plugin.name = "FFMPEG audio player", .plugin.descr = "decodes audio formats using FFMPEG libavcodec", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/flac/flac.c b/plugins/flac/flac.c index 73212b68..a6ceb497 100644 --- a/plugins/flac/flac.c +++ b/plugins/flac/flac.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1049,7 +1049,7 @@ static DB_decoder_t plugin = { .plugin.name = "FLAC decoder", .plugin.descr = "FLAC decoder using libFLAC", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/gme/cgme.c b/plugins/gme/cgme.c index daf0b981..48622266 100644 --- a/plugins/gme/cgme.c +++ b/plugins/gme/cgme.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -460,7 +460,7 @@ static DB_decoder_t plugin = { .plugin.name = "Game-Music-Emu player", .plugin.descr = "chiptune/game music player based on GME library", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Uses Game-Music-Emu by Shay Green , http://code.google.com/p/game-music-emu/\n" "\n" diff --git a/plugins/gtkui/actions.c b/plugins/gtkui/actions.c index 0ddbdceb..3b7bc5c8 100644 --- a/plugins/gtkui/actions.c +++ b/plugins/gtkui/actions.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko , + Copyright (C) 2009-2012 Alexey Yakovenko , Viktor Semykin This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/actions.h b/plugins/gtkui/actions.h index aacff34b..56dc3425 100644 --- a/plugins/gtkui/actions.h +++ b/plugins/gtkui/actions.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko , + Copyright (C) 2009-2012 Alexey Yakovenko , Viktor Semykin This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index 63f48348..a82733c1 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/gtkui/callbacks.h b/plugins/gtkui/callbacks.h index 953f0629..e55c6360 100644 --- a/plugins/gtkui/callbacks.h +++ b/plugins/gtkui/callbacks.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/gtkui/coverart.c b/plugins/gtkui/coverart.c index 4118aa66..e0451f5a 100644 --- a/plugins/gtkui/coverart.c +++ b/plugins/gtkui/coverart.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/coverart.h b/plugins/gtkui/coverart.h index 689e0f80..490f62e1 100644 --- a/plugins/gtkui/coverart.h +++ b/plugins/gtkui/coverart.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/ddblistview.c b/plugins/gtkui/ddblistview.c index 85ed2130..6312a103 100644 --- a/plugins/gtkui/ddblistview.c +++ b/plugins/gtkui/ddblistview.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/gtkui/ddblistview.h b/plugins/gtkui/ddblistview.h index a43dbcc3..d03cd240 100644 --- a/plugins/gtkui/ddblistview.h +++ b/plugins/gtkui/ddblistview.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/gtkui/ddbtabstrip.c b/plugins/gtkui/ddbtabstrip.c index 73131441..ab8fad1e 100644 --- a/plugins/gtkui/ddbtabstrip.c +++ b/plugins/gtkui/ddbtabstrip.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/ddbtabstrip.h b/plugins/gtkui/ddbtabstrip.h index c68b95f1..a34eb5eb 100644 --- a/plugins/gtkui/ddbtabstrip.h +++ b/plugins/gtkui/ddbtabstrip.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/ddbvolumebar.c b/plugins/gtkui/ddbvolumebar.c index 4d98cb05..7c74cbec 100644 --- a/plugins/gtkui/ddbvolumebar.c +++ b/plugins/gtkui/ddbvolumebar.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/ddbvolumebar.h b/plugins/gtkui/ddbvolumebar.h index d2cfbe61..7db07479 100644 --- a/plugins/gtkui/ddbvolumebar.h +++ b/plugins/gtkui/ddbvolumebar.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/drawing.h b/plugins/gtkui/drawing.h index 3556ec62..6d573346 100644 --- a/plugins/gtkui/drawing.h +++ b/plugins/gtkui/drawing.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/dspconfig.c b/plugins/gtkui/dspconfig.c index 9cc012f0..95767284 100644 --- a/plugins/gtkui/dspconfig.c +++ b/plugins/gtkui/dspconfig.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/dspconfig.h b/plugins/gtkui/dspconfig.h index 6b7f5310..4d945f2c 100644 --- a/plugins/gtkui/dspconfig.h +++ b/plugins/gtkui/dspconfig.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/eq.c b/plugins/gtkui/eq.c index c534dfb6..b0990432 100644 --- a/plugins/gtkui/eq.c +++ b/plugins/gtkui/eq.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/eq.h b/plugins/gtkui/eq.h index 570cd935..f9227278 100644 --- a/plugins/gtkui/eq.h +++ b/plugins/gtkui/eq.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/gdkdrawing.c b/plugins/gtkui/gdkdrawing.c index 41967bb8..9580af40 100644 --- a/plugins/gtkui/gdkdrawing.c +++ b/plugins/gtkui/gdkdrawing.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index 4379d1a4..a4593ea0 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1383,7 +1383,7 @@ static ddb_gtkui_t plugin = { .gui.plugin.descr = "User interface using GTK+ 2.x", #endif .gui.plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/gtkui/gtkui.h b/plugins/gtkui/gtkui.h index b4422c06..b19a734f 100644 --- a/plugins/gtkui/gtkui.h +++ b/plugins/gtkui/gtkui.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/gtkui_api.h b/plugins/gtkui/gtkui_api.h index f20c411e..7fa7944f 100644 --- a/plugins/gtkui/gtkui_api.h +++ b/plugins/gtkui/gtkui_api.h @@ -2,7 +2,7 @@ gtkui_api.h -- API of the DeaDBeeF GTK UI plugin http://deadbeef.sourceforge.net - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/plugins/gtkui/mainplaylist.c b/plugins/gtkui/mainplaylist.c index 7cf9a2f4..21661f6d 100644 --- a/plugins/gtkui/mainplaylist.c +++ b/plugins/gtkui/mainplaylist.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/mainplaylist.h b/plugins/gtkui/mainplaylist.h index b17ef63d..34cc67bc 100644 --- a/plugins/gtkui/mainplaylist.h +++ b/plugins/gtkui/mainplaylist.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/parser.c b/plugins/gtkui/parser.c index 6ee81f9a..c49eeb72 100644 --- a/plugins/gtkui/parser.c +++ b/plugins/gtkui/parser.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/gtkui/parser.h b/plugins/gtkui/parser.h index ac411577..b0f95169 100644 --- a/plugins/gtkui/parser.h +++ b/plugins/gtkui/parser.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/gtkui/plcommon.c b/plugins/gtkui/plcommon.c index 8f14afbc..09b65353 100644 --- a/plugins/gtkui/plcommon.c +++ b/plugins/gtkui/plcommon.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/plcommon.h b/plugins/gtkui/plcommon.h index b747b0d1..3c24f00f 100644 --- a/plugins/gtkui/plcommon.h +++ b/plugins/gtkui/plcommon.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/pluginconf.c b/plugins/gtkui/pluginconf.c index 42070d4d..1f265372 100644 --- a/plugins/gtkui/pluginconf.c +++ b/plugins/gtkui/pluginconf.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/pluginconf.h b/plugins/gtkui/pluginconf.h index 102691aa..5a1c5895 100644 --- a/plugins/gtkui/pluginconf.h +++ b/plugins/gtkui/pluginconf.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/prefwin.c b/plugins/gtkui/prefwin.c index 5ea69196..a50a40e2 100644 --- a/plugins/gtkui/prefwin.c +++ b/plugins/gtkui/prefwin.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/progress.c b/plugins/gtkui/progress.c index 359b0eae..98a6b461 100644 --- a/plugins/gtkui/progress.c +++ b/plugins/gtkui/progress.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/gtkui/progress.h b/plugins/gtkui/progress.h index 86558106..97366565 100644 --- a/plugins/gtkui/progress.h +++ b/plugins/gtkui/progress.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/gtkui/search.c b/plugins/gtkui/search.c index e3d46819..662839bf 100644 --- a/plugins/gtkui/search.c +++ b/plugins/gtkui/search.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/gtkui/search.h b/plugins/gtkui/search.h index 98216d5c..104bc24f 100644 --- a/plugins/gtkui/search.h +++ b/plugins/gtkui/search.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/gtkui/tagwritersettings.c b/plugins/gtkui/tagwritersettings.c index ede3d447..d7554bac 100644 --- a/plugins/gtkui/tagwritersettings.c +++ b/plugins/gtkui/tagwritersettings.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/tagwritersettings.h b/plugins/gtkui/tagwritersettings.h index a48aaacb..fedaa2ba 100644 --- a/plugins/gtkui/tagwritersettings.h +++ b/plugins/gtkui/tagwritersettings.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/timeline.c b/plugins/gtkui/timeline.c index 83fc7f0f..224d3671 100644 --- a/plugins/gtkui/timeline.c +++ b/plugins/gtkui/timeline.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/timeline.h b/plugins/gtkui/timeline.h index 4223a84b..dc4cc7f9 100644 --- a/plugins/gtkui/timeline.h +++ b/plugins/gtkui/timeline.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/trkproperties.c b/plugins/gtkui/trkproperties.c index d575c759..590bf1fa 100644 --- a/plugins/gtkui/trkproperties.c +++ b/plugins/gtkui/trkproperties.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/trkproperties.h b/plugins/gtkui/trkproperties.h index ccdaa69f..8b2b6311 100644 --- a/plugins/gtkui/trkproperties.h +++ b/plugins/gtkui/trkproperties.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/wingeom.c b/plugins/gtkui/wingeom.c index 47b6f960..49e1c9b5 100644 --- a/plugins/gtkui/wingeom.c +++ b/plugins/gtkui/wingeom.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/gtkui/wingeom.h b/plugins/gtkui/wingeom.h index 9b468846..dcbb2c79 100644 --- a/plugins/gtkui/wingeom.h +++ b/plugins/gtkui/wingeom.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/hotkeys/hotkeys.c b/plugins/hotkeys/hotkeys.c index 884b2be9..c7c1c1f3 100644 --- a/plugins/hotkeys/hotkeys.c +++ b/plugins/hotkeys/hotkeys.c @@ -623,7 +623,7 @@ static DB_hotkeys_plugin_t plugin = { .misc.plugin.name = "Global hotkeys support", .misc.plugin.descr = "Allows one to control player with global hotkeys", .misc.plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "Copyright (C) 2009-2011 Viktor Semykin \n" "\n" "This program is free software; you can redistribute it and/or\n" diff --git a/plugins/hotkeys/hotkeys.h b/plugins/hotkeys/hotkeys.h index 010f0919..a86f357d 100644 --- a/plugins/hotkeys/hotkeys.h +++ b/plugins/hotkeys/hotkeys.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/lastfm/lastfm.c b/plugins/lastfm/lastfm.c index c8794e31..377947ad 100644 --- a/plugins/lastfm/lastfm.c +++ b/plugins/lastfm/lastfm.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -957,7 +957,7 @@ static DB_misc_t plugin = { .plugin.name = "last.fm scrobbler", .plugin.descr = "Sends played songs information to your last.fm account, or other service that use AudioScrobbler protocol", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/m3u/m3u.c b/plugins/m3u/m3u.c index 030507e2..b8dbe1d6 100644 --- a/plugins/m3u/m3u.c +++ b/plugins/m3u/m3u.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -530,7 +530,7 @@ DB_playlist_t plugin = { .plugin.name = "M3U and PLS support", .plugin.descr = "Importing and exporting M3U and PLS formats\nRecognizes .pls, .m3u and .m3u8 file types\n\nNOTE: only utf8 file names are currently supported", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/mms/mmsplug.c b/plugins/mms/mmsplug.c index 324efdc5..94d0ed3c 100644 --- a/plugins/mms/mmsplug.c +++ b/plugins/mms/mmsplug.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -127,7 +127,7 @@ static DB_vfs_t plugin = { .plugin.name = "mms vfs", .plugin.descr = "MMS streaming plugin based on libmms", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Uses modified libmms-0.6.0, http://sourceforge.net/projects/libmms/\n" "\n" diff --git a/plugins/mono2stereo/mono2stereo.c b/plugins/mono2stereo/mono2stereo.c index 66168bed..d6e286a4 100644 --- a/plugins/mono2stereo/mono2stereo.c +++ b/plugins/mono2stereo/mono2stereo.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -144,7 +144,7 @@ static DB_dsp_t plugin = { .plugin.name = "Mono to stereo", .plugin.descr = "DSP plugin to convert mono to stereo", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/mpgmad/mpgmad.c b/plugins/mpgmad/mpgmad.c index 041386a2..487219e2 100644 --- a/plugins/mpgmad/mpgmad.c +++ b/plugins/mpgmad/mpgmad.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1451,7 +1451,7 @@ static DB_decoder_t plugin = { .plugin.name = "MPEG decoder", .plugin.descr = "MPEG v1/2 layer1/2/3 decoder based on libmad", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/musepack/musepack.c b/plugins/musepack/musepack.c index 8144ac52..69f0455a 100644 --- a/plugins/musepack/musepack.c +++ b/plugins/musepack/musepack.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -534,7 +534,7 @@ static DB_decoder_t plugin = { .plugin.name = "MusePack decoder", .plugin.descr = "Musepack decoder using libmppdec", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Uses Musepack SV8 libs (r435), (C) 2005-2009, The Musepack Development Team\n" "\n" diff --git a/plugins/notify/notify.c b/plugins/notify/notify.c index 50157921..905b65e0 100644 --- a/plugins/notify/notify.c +++ b/plugins/notify/notify.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -333,7 +333,7 @@ DB_misc_t plugin = { .plugin.name = "OSD Notify", .plugin.descr = "Displays notifications when new track starts.\nRequires dbus and notification daemon to be running.\nNotification daemon should be provided by your desktop environment.\n", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/nullout/nullout.c b/plugins/nullout/nullout.c index 48fcb5af..65e0273f 100644 --- a/plugins/nullout/nullout.c +++ b/plugins/nullout/nullout.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -199,7 +199,7 @@ static DB_output_t plugin = { .plugin.name = "null output plugin", .plugin.descr = "doesn't play anything", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/oss/oss.c b/plugins/oss/oss.c index b263aa17..6a747a2f 100644 --- a/plugins/oss/oss.c +++ b/plugins/oss/oss.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -382,7 +382,7 @@ static DB_output_t plugin = { .plugin.name = "OSS output plugin", .plugin.descr = "plays sound via OSS API", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/pulse/pulse.c b/plugins/pulse/pulse.c index 76baf98c..e8863094 100644 --- a/plugins/pulse/pulse.c +++ b/plugins/pulse/pulse.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -367,7 +367,7 @@ static DB_output_t plugin = .plugin.descr = "At the moment of this writing, PulseAudio seems to be very unstable in many (or most) GNU/Linux distributions.\nIf you experience problems - please try switching to ALSA or OSS output.\nIf that doesn't help - please uninstall PulseAudio from your system, and try ALSA or OSS again.\nThanks for understanding", .plugin.copyright = "Copyright (C) 2011 Jan D. Behrens \n" - "Copyright (C) 2010-2011 Alexey Yakovenko \n" + "Copyright (C) 2010-2012 Alexey Yakovenko \n" "Copyright (C) 2010 Anton Novikov \n" "\n" "This program is free software; you can redistribute it and/or\n" diff --git a/plugins/shellexec/shellexec.c b/plugins/shellexec/shellexec.c index 4edfd796..3ee26aa4 100644 --- a/plugins/shellexec/shellexec.c +++ b/plugins/shellexec/shellexec.c @@ -1,6 +1,6 @@ /* Shellexec plugin for DeaDBeeF - Copyright (C) 2010-2011 Alexey Yakovenko + Copyright (C) 2010-2012 Alexey Yakovenko Copyright (C) 2010 Viktor Semykin This program is free software: you can redistribute it and/or modify @@ -245,7 +245,7 @@ static DB_misc_t plugin = { "this would show the name of selected track in notification popup" , .plugin.copyright = - "Copyright (C) 2010-2011 Alexey Yakovenko \n" + "Copyright (C) 2010-2012 Alexey Yakovenko \n" "Copyright (C) 2010 Viktor Semykin \n" "\n" "This program is free software; you can redistribute it and/or\n" diff --git a/plugins/shn/shn.c b/plugins/shn/shn.c index c9d4acaf..da69866b 100644 --- a/plugins/shn/shn.c +++ b/plugins/shn/shn.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1804,7 +1804,7 @@ static DB_decoder_t plugin = { .plugin.name = "Shorten player", .plugin.descr = "decodes shn files", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Based on xmms-shn, http://www.etree.org/shnutils/xmms-shn/\n" "Copyright (C) 2000-2007 Jason Jordan \n" diff --git a/plugins/sid/csid.cpp b/plugins/sid/csid.cpp index 24e812ff..2bb5b84e 100644 --- a/plugins/sid/csid.cpp +++ b/plugins/sid/csid.cpp @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/sid/csid.h b/plugins/sid/csid.h index e40f8c69..39988f2d 100644 --- a/plugins/sid/csid.h +++ b/plugins/sid/csid.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/plugins/sid/plugin.c b/plugins/sid/plugin.c index 772b37a9..56223ec9 100644 --- a/plugins/sid/plugin.c +++ b/plugins/sid/plugin.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,7 +38,7 @@ DB_decoder_t sid_plugin = { .plugin.id = "sidplay2", .plugin.descr = "SID player based on libsidplay2", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Uses modified libsidplay2-2.1.0\n" "Commodore 64 SID emulation library\n" diff --git a/plugins/sndfile/sndfile.c b/plugins/sndfile/sndfile.c index 40a182f7..071dffdb 100644 --- a/plugins/sndfile/sndfile.c +++ b/plugins/sndfile/sndfile.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -544,7 +544,7 @@ static DB_decoder_t plugin = { .plugin.name = "WAV/PCM player", .plugin.descr = "wav/aiff player using libsndfile", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/soundtouch/plugin.c b/plugins/soundtouch/plugin.c index 770f1c0a..6e813d4b 100644 --- a/plugins/soundtouch/plugin.c +++ b/plugins/soundtouch/plugin.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -274,7 +274,7 @@ static DB_dsp_t plugin = { .plugin.name = "Soundtouch", .plugin.descr = "Tempo/Pitch/Rate changer using SoundTouch Library (http://www.surina.net/soundtouch)", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "uses SoundTouch Library, (C) Olli Parviainen" "\n" diff --git a/plugins/soundtouch/st.cpp b/plugins/soundtouch/st.cpp index 458a5b44..50390c1c 100644 --- a/plugins/soundtouch/st.cpp +++ b/plugins/soundtouch/st.cpp @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/soundtouch/st.h b/plugins/soundtouch/st.h index ae1f4f05..9ea5c65c 100644 --- a/plugins/soundtouch/st.h +++ b/plugins/soundtouch/st.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/supereq/Equ.cpp b/plugins/supereq/Equ.cpp index 0aff4f8a..8e91f113 100644 --- a/plugins/supereq/Equ.cpp +++ b/plugins/supereq/Equ.cpp @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko Original SuperEQ code (C) Naoki Shibata This program is free software; you can redistribute it and/or diff --git a/plugins/supereq/Equ.h b/plugins/supereq/Equ.h index a315741a..f9cfaf15 100644 --- a/plugins/supereq/Equ.h +++ b/plugins/supereq/Equ.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/supereq/supereq.c b/plugins/supereq/supereq.c index ac18285c..d50aff12 100644 --- a/plugins/supereq/supereq.c +++ b/plugins/supereq/supereq.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -282,7 +282,7 @@ static DB_dsp_t plugin = { .plugin.name = "SuperEQ", .plugin.descr = "equalizer plugin using SuperEQ library", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Uses supereq library by Naoki Shibata, http://shibatch.sourceforge.net\n" "Uses FFT library by Takuya Ooura, http://www.kurims.kyoto-u.ac.jp/~ooura/\n" diff --git a/plugins/tta/ttaplug.c b/plugins/tta/ttaplug.c index 48d38110..5b433e44 100644 --- a/plugins/tta/ttaplug.c +++ b/plugins/tta/ttaplug.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -324,7 +324,7 @@ static DB_decoder_t plugin = { .plugin.name = "tta decoder", .plugin.descr = "tta decoder based on TTA Hardware Players Library Version 1.2", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Uses modified TTA Hardware Players Library Version 1.2,\n" "(c) 2004 Alexander Djourik. All rights reserved.\n" diff --git a/plugins/uade2/plugin.c b/plugins/uade2/plugin.c index a07f82fe..b28861fe 100644 --- a/plugins/uade2/plugin.c +++ b/plugins/uade2/plugin.c @@ -1,6 +1,6 @@ /* ddb_input_uade2 - UADE input plugin for DeaDBeeF player - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko based on UADE2 plugin for Audacious, Copyright (C) 2005-2006 Heikki Orsila, UADE TEAM This program is free software; you can redistribute it and/or diff --git a/plugins/vfs_curl/vfs_curl.c b/plugins/vfs_curl/vfs_curl.c index 1b931cc0..b0779da7 100644 --- a/plugins/vfs_curl/vfs_curl.c +++ b/plugins/vfs_curl/vfs_curl.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1096,7 +1096,7 @@ static DB_vfs_t plugin = { .plugin.name = "cURL vfs", .plugin.descr = "http and ftp streaming module using libcurl, with ICY protocol support", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/vfs_zip/vfs_zip.c b/plugins/vfs_zip/vfs_zip.c index d6b1b32b..f8ad50a1 100644 --- a/plugins/vfs_zip/vfs_zip.c +++ b/plugins/vfs_zip/vfs_zip.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -219,7 +219,7 @@ static DB_vfs_t plugin = { .plugin.name = "ZIP vfs", .plugin.descr = "play files directly from zip files", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/vorbis/vorbis.c b/plugins/vorbis/vorbis.c index 02c85569..cbc23a62 100644 --- a/plugins/vorbis/vorbis.c +++ b/plugins/vorbis/vorbis.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -777,7 +777,7 @@ static DB_decoder_t plugin = { .plugin.name = "OggVorbis decoder", .plugin.descr = "OggVorbis decoder using standard xiph.org libraries", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/plugins/vtx/vtx.c b/plugins/vtx/vtx.c index 53511b7c..81a60b0e 100644 --- a/plugins/vtx/vtx.c +++ b/plugins/vtx/vtx.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -307,7 +307,7 @@ static DB_decoder_t plugin = { .plugin.name = "VTX player", .plugin.descr = "AY8910/12 chip emulator and vtx file player", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Uses libayemu - AY/YM sound chip emulator and music file loader\n" "Copyright (C) 2003-2004 Sashnov Alexander\n" diff --git a/plugins/wildmidi/wildmidiplug.c b/plugins/wildmidi/wildmidiplug.c index fc07754b..36e2be3f 100644 --- a/plugins/wildmidi/wildmidiplug.c +++ b/plugins/wildmidi/wildmidiplug.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -191,7 +191,7 @@ DB_decoder_t wmidi_plugin = { .plugin.name = "WildMidi player", .plugin.descr = "MIDI player based on WildMidi library\n\nRequires freepats package to be installed\nSee http://freepats.zenvoid.org/\nMake sure to set correct freepats.cfg path in plugin settings.", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "Uses modified WildMidi v0.2.2\n" "(C) 2001-2004 Chris Ison\n" diff --git a/premix.c b/premix.c index e8748a74..67b3b18a 100644 --- a/premix.c +++ b/premix.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/premix.h b/premix.h index 39d1700d..7d0d1422 100644 --- a/premix.h +++ b/premix.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/replaygain.c b/replaygain.c index b2791b4c..ba8d5e37 100644 --- a/replaygain.c +++ b/replaygain.c @@ -1,7 +1,7 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/replaygain.h b/replaygain.h index f7027230..00ab3493 100644 --- a/replaygain.h +++ b/replaygain.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/ringbuf.c b/ringbuf.c index be82945e..b06da6c0 100644 --- a/ringbuf.c +++ b/ringbuf.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/ringbuf.h b/ringbuf.h index e7008bf8..2c349d13 100644 --- a/ringbuf.h +++ b/ringbuf.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/shortlicense b/shortlicense index 09c9da8b..8d9c6d9f 100644 --- a/shortlicense +++ b/shortlicense @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/streamer.c b/streamer.c index 0efb07ba..d85ec52c 100644 --- a/streamer.c +++ b/streamer.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/streamer.h b/streamer.h index 8703c661..79d252f1 100644 --- a/streamer.h +++ b/streamer.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/threading.h b/threading.h index d7ff5686..00dd6e0c 100644 --- a/threading.h +++ b/threading.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/threading_pthread.c b/threading_pthread.c index d870ac36..d5fcc9e7 100644 --- a/threading_pthread.c +++ b/threading_pthread.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/tools/pluginfo/pluginfo.c b/tools/pluginfo/pluginfo.c index 09cbeb78..d1e4f4b9 100644 --- a/tools/pluginfo/pluginfo.c +++ b/tools/pluginfo/pluginfo.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utf8.c b/utf8.c index 6165742e..bcbfa4a1 100644 --- a/utf8.c +++ b/utf8.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/utf8.h b/utf8.h index d72d14a1..fab4ac1e 100644 --- a/utf8.h +++ b/utf8.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/vfs.c b/vfs.c index 08badec1..7c8a39f2 100644 --- a/vfs.c +++ b/vfs.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/vfs.h b/vfs.h index b07bcaf3..8c0981c9 100644 --- a/vfs.h +++ b/vfs.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/vfs_stdio.c b/vfs_stdio.c index 6f006efa..46ea47f8 100644 --- a/vfs_stdio.c +++ b/vfs_stdio.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -172,7 +172,7 @@ static DB_vfs_t plugin = { .plugin.id = "vfs_stdio", .plugin.descr = "Standard IO plugin\nUsed for reading normal local files\nIt is statically linked, so you can't delete it.", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko \n" + "Copyright (C) 2009-2012 Alexey Yakovenko \n" "\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License\n" diff --git a/volume.c b/volume.c index db32ed99..acd84cf3 100644 --- a/volume.c +++ b/volume.c @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/volume.h b/volume.h index 593088e2..7670f5fc 100644 --- a/volume.h +++ b/volume.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Copyright (C) 2009-2012 Alexey Yakovenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License -- cgit v1.2.3 From 26293f4882d7476459a0aa90e992ad67a4585375 Mon Sep 17 00:00:00 2001 From: waker Date: Fri, 6 Apr 2012 10:32:38 +0200 Subject: added random sort (based on patch from defusix) --- deadbeef.h | 9 ++++++- playlist.c | 58 +++++++++++++++++++++++++++++++++++++++++++- playlist.h | 5 +++- plugins.c | 2 +- plugins/gtkui/callbacks.c | 27 ++++++++++++++++----- plugins/gtkui/callbacks.h | 4 +++ plugins/gtkui/deadbeef.glade | 9 +++++++ plugins/gtkui/interface.c | 9 +++++++ 8 files changed, 113 insertions(+), 10 deletions(-) (limited to 'playlist.c') diff --git a/deadbeef.h b/deadbeef.h index 4a127110..f5b999ad 100644 --- a/deadbeef.h +++ b/deadbeef.h @@ -295,6 +295,13 @@ enum { DDB_REPLAYGAIN_TRACKPEAK, }; +// sort order constants +enum ddb_sort_order_t { + DDB_SORT_DESCENDING, + DDB_SORT_ASCENDING, + DDB_SORT_RANDOM, // available since API 1.3 +}; + // typecasting macros #define DB_PLUGIN(x) ((DB_plugin_t *)(x)) #define DB_CALLBACK(x) ((DB_callback_t)(x)) @@ -476,7 +483,7 @@ typedef struct { void (*plt_copy_items) (ddb_playlist_t *to, int iter, ddb_playlist_t * from, DB_playItem_t *before, uint32_t *indices, int cnt); void (*plt_search_reset) (ddb_playlist_t *plt); void (*plt_search_process) (ddb_playlist_t *plt, const char *text); - void (*plt_sort) (ddb_playlist_t *plt, int iter, int id, const char *format, int ascending); + void (*plt_sort) (ddb_playlist_t *plt, int iter, int id, const char *format, int order); // add files and folders to current playlist int (*plt_add_file) (ddb_playlist_t *plt, const char *fname, int (*cb)(DB_playItem_t *it, void *data), void *user_data); diff --git a/playlist.c b/playlist.c index d339d1ac..4975faf0 100644 --- a/playlist.c +++ b/playlist.c @@ -3174,7 +3174,13 @@ qsort_cmp_func (const void *a, const void *b) { } void -plt_sort (playlist_t *playlist, int iter, int id, const char *format, int ascending) { +plt_sort (playlist_t *playlist, int iter, int id, const char *format, int order) { + if (order == DDB_SORT_RANDOM) { + plt_sort_random (playlist, iter); + return; + } + int ascending = order == DDB_SORT_DESCENDING ? 0 : 1; + if (id == DB_COLUMN_FILENUMBER || !playlist->head[iter] || !playlist->head[iter]->next[iter]) { return; } @@ -3233,6 +3239,56 @@ plt_sort (playlist_t *playlist, int iter, int id, const char *format, int ascend UNLOCK; } +void +plt_sort_random (playlist_t *playlist, int iter) { + if (!playlist->head[iter] || !playlist->head[iter]->next[iter]) { + return; + } + + LOCK; + + const int playlist_count = playlist->count[iter]; + playItem_t **array = malloc (playlist_count * sizeof (playItem_t *)); + int idx = 0; + for (playItem_t *it = playlist->head[iter]; it; it = it->next[iter], idx++) { + array[idx] = it; + } + + //randomize array + for (int swap_a = 0; swap_a < playlist_count - 1; swap_a++) { + //select random item above swap_a-1 + const int swap_b = swap_a + (rand() / (float)RAND_MAX * (playlist_count - swap_a)); + + //swap a with b + playItem_t* const swap_temp = array[swap_a]; + array[swap_a] = array[swap_b]; + array[swap_b] = swap_temp; + + } + + playItem_t *prev = NULL; + playlist->head[iter] = 0; + for (idx = 0; idx < playlist->count[iter]; idx++) { + playItem_t *it = array[idx]; + it->prev[iter] = prev; + it->next[iter] = NULL; + if (!prev) { + playlist->head[iter] = it; + } + else { + prev->next[iter] = it; + } + prev = it; + } + playlist->tail[iter] = array[playlist->count[iter]-1]; + + free (array); + + plt_modified (playlist); + + UNLOCK; +} + void plt_reset_cursor (playlist_t *playlist) { int i; diff --git a/playlist.h b/playlist.h index f5cca51f..fefb3943 100644 --- a/playlist.h +++ b/playlist.h @@ -400,7 +400,10 @@ void plt_search_process (playlist_t *plt, const char *text); void -plt_sort (playlist_t *plt, int iter, int id, const char *format, int ascending); +plt_sort (playlist_t *plt, int iter, int id, const char *format, int order); + +void +plt_sort_random (playlist_t *plt, int iter); // playqueue support functions int diff --git a/plugins.c b/plugins.c index 4d83444b..d19139ff 100644 --- a/plugins.c +++ b/plugins.c @@ -172,7 +172,7 @@ static DB_functions_t deadbeef_api = { .pl_get_item_duration = (float (*) (DB_playItem_t *it))pl_get_item_duration, .pl_get_item_flags = (uint32_t (*) (DB_playItem_t *it))pl_get_item_flags, .pl_set_item_flags = (void (*) (DB_playItem_t *it, uint32_t flags))pl_set_item_flags, - .plt_sort = (void (*) (ddb_playlist_t *plt, int iter, int id, const char *format, int ascending))plt_sort, + .plt_sort = (void (*) (ddb_playlist_t *plt, int iter, int id, const char *format, int order))plt_sort, .pl_items_copy_junk = (void (*)(DB_playItem_t *from, DB_playItem_t *first, DB_playItem_t *last))pl_items_copy_junk, .pl_set_item_replaygain = (void (*)(DB_playItem_t *it, int idx, float value))pl_set_item_replaygain, .pl_get_item_replaygain = (float (*)(DB_playItem_t *it, int idx))pl_get_item_replaygain, diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index 3005bc27..be18328c 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -1154,7 +1154,7 @@ on_sort_by_title_activate (GtkMenuItem *menuitem, gpointer user_data) { ddb_playlist_t *plt = deadbeef->plt_get_curr (); - deadbeef->plt_sort (plt, PL_MAIN, -1, "%t", 1); + deadbeef->plt_sort (plt, PL_MAIN, -1, "%t", DDB_SORT_ASCENDING); deadbeef->plt_unref (plt); DdbListview *pl = DDB_LISTVIEW (lookup_widget (mainwin, "playlist")); @@ -1168,7 +1168,7 @@ on_sort_by_track_nr_activate (GtkMenuItem *menuitem, gpointer user_data) { ddb_playlist_t *plt = deadbeef->plt_get_curr (); - deadbeef->plt_sort (plt, PL_MAIN, -1, "%n", 1); + deadbeef->plt_sort (plt, PL_MAIN, -1, "%n", DDB_SORT_ASCENDING); deadbeef->plt_unref (plt); DdbListview *pl = DDB_LISTVIEW (lookup_widget (mainwin, "playlist")); @@ -1182,7 +1182,7 @@ on_sort_by_album_activate (GtkMenuItem *menuitem, gpointer user_data) { ddb_playlist_t *plt = deadbeef->plt_get_curr (); - deadbeef->plt_sort (plt, PL_MAIN, -1, "%b", 1); + deadbeef->plt_sort (plt, PL_MAIN, -1, "%b", DDB_SORT_ASCENDING); deadbeef->plt_unref (plt); DdbListview *pl = DDB_LISTVIEW (lookup_widget (mainwin, "playlist")); @@ -1196,7 +1196,7 @@ on_sort_by_artist_activate (GtkMenuItem *menuitem, gpointer user_data) { ddb_playlist_t *plt = deadbeef->plt_get_curr (); - deadbeef->plt_sort (plt, PL_MAIN, -1, "%a", 1); + deadbeef->plt_sort (plt, PL_MAIN, -1, "%a", DDB_SORT_ASCENDING); deadbeef->plt_unref (plt); DdbListview *pl = DDB_LISTVIEW (lookup_widget (mainwin, "playlist")); @@ -1210,7 +1210,22 @@ on_sort_by_date_activate (GtkMenuItem *menuitem, gpointer user_data) { ddb_playlist_t *plt = deadbeef->plt_get_curr (); - deadbeef->plt_sort (plt, PL_MAIN, -1, "%y", 1); + deadbeef->plt_sort (plt, PL_MAIN, -1, "%y", DDB_SORT_ASCENDING); + deadbeef->plt_unref (plt); + + DdbListview *pl = DDB_LISTVIEW (lookup_widget (mainwin, "playlist")); + ddb_listview_clear_sort (pl); + ddb_listview_refresh (pl, DDB_REFRESH_LIST | DDB_LIST_CHANGED); +} + + +void +on_sort_by_random_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + ddb_playlist_t *plt = deadbeef->plt_get_curr (); + deadbeef->plt_sort (plt, PL_MAIN, -1, NULL, DDB_SORT_RANDOM); + deadbeef->plt_unref (plt); DdbListview *pl = DDB_LISTVIEW (lookup_widget (mainwin, "playlist")); @@ -1246,7 +1261,7 @@ on_sort_by_custom_activate (GtkMenuItem *menuitem, deadbeef->conf_set_str ("gtkui.sortby_fmt", fmt); ddb_playlist_t *plt = deadbeef->plt_get_curr (); - deadbeef->plt_sort (plt, PL_MAIN, -1, fmt, order == 0 ? 1 : 0); + deadbeef->plt_sort (plt, PL_MAIN, -1, fmt, order == 0 ? DDB_SORT_ASCENDING : DDB_SORT_DESCENDING); deadbeef->plt_unref (plt); DdbListview *pl = DDB_LISTVIEW (lookup_widget (mainwin, "playlist")); diff --git a/plugins/gtkui/callbacks.h b/plugins/gtkui/callbacks.h index e463394d..a354baca 100644 --- a/plugins/gtkui/callbacks.h +++ b/plugins/gtkui/callbacks.h @@ -1148,6 +1148,10 @@ void on_sort_by_date_activate (GtkMenuItem *menuitem, gpointer user_data); +void +on_sort_by_random_activate (GtkMenuItem *menuitem, + gpointer user_data); + void on_sort_by_custom_activate (GtkMenuItem *menuitem, gpointer user_data); diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade index cffda5b5..184b66fd 100644 --- a/plugins/gtkui/deadbeef.glade +++ b/plugins/gtkui/deadbeef.glade @@ -364,6 +364,15 @@ + + + True + Random + True + + + + True diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c index 57db14db..84649092 100644 --- a/plugins/gtkui/interface.c +++ b/plugins/gtkui/interface.c @@ -69,6 +69,7 @@ create_mainwin (void) GtkWidget *album1; GtkWidget *artist1; GtkWidget *date1; + GtkWidget *random1; GtkWidget *custom2; GtkWidget *separator5; GtkWidget *preferences; @@ -312,6 +313,10 @@ create_mainwin (void) gtk_widget_show (date1); gtk_container_add (GTK_CONTAINER (sort_by1_menu), date1); + random1 = gtk_menu_item_new_with_mnemonic (_("Random")); + gtk_widget_show (random1); + gtk_container_add (GTK_CONTAINER (sort_by1_menu), random1); + custom2 = gtk_menu_item_new_with_mnemonic (_("Custom")); gtk_widget_show (custom2); gtk_container_add (GTK_CONTAINER (sort_by1_menu), custom2); @@ -693,6 +698,9 @@ create_mainwin (void) g_signal_connect ((gpointer) date1, "activate", G_CALLBACK (on_sort_by_date_activate), NULL); + g_signal_connect ((gpointer) random1, "activate", + G_CALLBACK (on_sort_by_random_activate), + NULL); g_signal_connect ((gpointer) custom2, "activate", G_CALLBACK (on_sort_by_custom_activate), NULL); @@ -819,6 +827,7 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, album1, "album1"); GLADE_HOOKUP_OBJECT (mainwin, artist1, "artist1"); GLADE_HOOKUP_OBJECT (mainwin, date1, "date1"); + GLADE_HOOKUP_OBJECT (mainwin, random1, "random1"); GLADE_HOOKUP_OBJECT (mainwin, custom2, "custom2"); GLADE_HOOKUP_OBJECT (mainwin, separator5, "separator5"); GLADE_HOOKUP_OBJECT (mainwin, preferences, "preferences"); -- cgit v1.2.3