From f8052de3759855ee29ce1f3200835196d41b89a7 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Sat, 18 Jun 2011 23:46:00 +0200 Subject: [PATCH] Remove trailing whitespace throughout the source tree. --- herrie/COPYING | 4 +-- herrie/configure | 12 +++---- herrie/man/00-man | 6 ++-- herrie/po/da.po | 2 +- herrie/po/pt_BR.po | 2 +- herrie/po/tr.po | 2 +- herrie/src/audio_file.c | 6 ++-- herrie/src/audio_file.h | 4 +-- herrie/src/audio_format.h | 4 +-- herrie/src/audio_format_modplug.c | 4 +-- herrie/src/audio_format_mp3.c | 22 ++++++------- herrie/src/audio_format_sndfile.c | 6 ++-- herrie/src/audio_format_vorbis.c | 10 +++--- herrie/src/audio_output.h | 4 +-- herrie/src/audio_output_alsa.c | 8 ++--- herrie/src/audio_output_ao.c | 4 +-- herrie/src/audio_output_coreaudio.c | 12 +++---- herrie/src/audio_output_null.c | 6 ++-- herrie/src/audio_output_oss.c | 8 ++--- herrie/src/audio_output_pulse.c | 4 +-- herrie/src/config.c | 18 +++++------ herrie/src/config.h | 4 +-- herrie/src/conftest.c | 4 +-- herrie/src/dbus.c | 6 ++-- herrie/src/dbus.h | 4 +-- herrie/src/gui.h | 4 +-- herrie/src/gui_browser.c | 10 +++--- herrie/src/gui_draw.c | 6 ++-- herrie/src/gui_input.c | 8 ++--- herrie/src/gui_internal.h | 4 +-- herrie/src/gui_msgbar.c | 4 +-- herrie/src/gui_playq.c | 10 +++--- herrie/src/gui_vfslist.c | 14 ++++---- herrie/src/gui_vfslist.h | 4 +-- herrie/src/main.c | 4 +-- herrie/src/md5.c | 4 +-- herrie/src/md5.h | 4 +-- herrie/src/playq.c | 8 ++--- herrie/src/playq.h | 4 +-- herrie/src/playq_modules.h | 4 +-- herrie/src/playq_party.c | 4 +-- herrie/src/playq_xmms.c | 6 ++-- herrie/src/scrobbler.c | 26 +++++++-------- herrie/src/scrobbler.h | 4 +-- herrie/src/stdinc.h | 4 +-- herrie/src/util.c | 4 +-- herrie/src/util.h | 4 +-- herrie/src/vfs.c | 18 +++++------ herrie/src/vfs.h | 4 +-- herrie/src/vfs_cache.c | 4 +-- herrie/src/vfs_http.c | 4 +-- herrie/src/vfs_modules.h | 4 +-- herrie/src/vfs_playlist.c | 12 +++---- herrie/src/vfs_regular.c | 8 ++--- herrie/src/vfs_xspf.c | 6 ++-- misc/cdepcalc.c | 6 ++-- www/index.html | 64 ++++++++++++++++++------------------- 57 files changed, 220 insertions(+), 220 deletions(-) diff --git a/herrie/COPYING b/herrie/COPYING index 36fd0d8..496bac8 100644 --- a/herrie/COPYING +++ b/herrie/COPYING @@ -3,7 +3,7 @@ All sourcecode in this package is subject to the following license: /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -12,7 +12,7 @@ All sourcecode in this package is subject to the following license: * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/configure b/herrie/configure index d6e9776..e22fda6 100755 --- a/herrie/configure +++ b/herrie/configure @@ -1,8 +1,8 @@ #!/bin/sh -# +# # Copyright (c) 2006-2009 Ed Schouten # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -11,7 +11,7 @@ # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# +# # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -23,7 +23,7 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# +# APP_NAME=herrie APP_VERSION=2.2 @@ -147,7 +147,7 @@ do alsa|ao|coreaudio|null|oss|pulse) CFG_AO=$1 ;; - + no_strip) unset CFG_STRIP ;; @@ -161,7 +161,7 @@ do verbose) unset DOIT ;; - + ncurses) CFG_CURSES_HEADER=ncurses CFG_CURSES_LIB=ncurses diff --git a/herrie/man/00-man b/herrie/man/00-man index 061c874..100b6c3 100644 --- a/herrie/man/00-man +++ b/herrie/man/00-man @@ -1,7 +1,7 @@ .\" .\" Copyright (c) 2006-2011 Ed Schouten .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -10,7 +10,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -30,7 +30,7 @@ herrie \- interactive music playlist player .B herrie .RB [ -pvx ] .RB [ -c -.IR configfile ] +.IR configfile ] .RI [ file .IR ... ] .SH DESCRIPTION diff --git a/herrie/po/da.po b/herrie/po/da.po index 21d2e5a..40b616d 100644 --- a/herrie/po/da.po +++ b/herrie/po/da.po @@ -249,7 +249,7 @@ msgstr "Kunne ikke sende sange til AudioScrobbler." msgid "Unknown user: %s\n" msgstr "Ukendt bruger: %s\n" -# chroot: The UNIX command to make the root directory (/) become something +# chroot: The UNIX command to make the root directory (/) become something # other than its default for the lifetime of the current process. #: vfs.c:220 #, c-format diff --git a/herrie/po/pt_BR.po b/herrie/po/pt_BR.po index 9506c3a..d5b0020 100644 --- a/herrie/po/pt_BR.po +++ b/herrie/po/pt_BR.po @@ -1,5 +1,5 @@ # Portuguese translation for Herrie. -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008 Free Software Foundation, Inc. # This file is distributed under the same license as the herrie package. # Eros Carvalho , 2007. msgid "" diff --git a/herrie/po/tr.po b/herrie/po/tr.po index 7e2b821..1b5634e 100644 --- a/herrie/po/tr.po +++ b/herrie/po/tr.po @@ -1,4 +1,4 @@ -# Translation of herrie to Turkish. +# Translation of herrie to Turkish. # Eren Türkay , 2007. msgid "" msgstr "" diff --git a/herrie/src/audio_file.c b/herrie/src/audio_file.c index fe80548..64d2783 100644 --- a/herrie/src/audio_file.c +++ b/herrie/src/audio_file.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -97,7 +97,7 @@ audio_file_open(const struct vfsref *vr) unsigned int i; out = g_slice_new0(struct audio_file); - + out->fp = vfs_open(vr); if (out->fp == NULL) goto bad; diff --git a/herrie/src/audio_file.h b/herrie/src/audio_file.h index 85b911f..870a04c 100644 --- a/herrie/src/audio_file.h +++ b/herrie/src/audio_file.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/audio_format.h b/herrie/src/audio_format.h index a60df44..4a0e2e0 100644 --- a/herrie/src/audio_format.h +++ b/herrie/src/audio_format.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/audio_format_modplug.c b/herrie/src/audio_format_modplug.c index 2f1da29..0fcb3e4 100644 --- a/herrie/src/audio_format_modplug.c +++ b/herrie/src/audio_format_modplug.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/audio_format_mp3.c b/herrie/src/audio_format_mp3.c index 2c4e19d..330dc0b 100644 --- a/herrie/src/audio_format_mp3.c +++ b/herrie/src/audio_format_mp3.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -97,11 +97,11 @@ mp3_match(FILE *fp, const char *ext) ret = -1; goto done; } - + /* Match 1: first twelve bits high */ if (buf[0] == 0xff && (buf[1] & 0xf0) == 0xf0) goto done; - + /* Match 2: ID3 header */ if (buf[0] == 'I' && buf[1] == 'D' && buf[2] == '3') goto done; @@ -130,14 +130,14 @@ mp3_readtags(struct audio_file *fd) tmpfd = dup(fileno(fd->fp)); if (tmpfd < 0) return; - + /* Backing up the original offset */ orig_off = lseek(tmpfd, 0, SEEK_CUR); id3f = id3_file_fdopen(tmpfd, ID3_FILE_MODE_READONLY); if (id3f == NULL) goto bad; - + /* Here we go */ tag = id3_file_tag(id3f); if (tag == NULL) @@ -161,7 +161,7 @@ mp3_readtags(struct audio_file *fd) *dst = (char*)id3_ucs4_utf8duplicate(str); } } - + done: id3_file_close(id3f); bad: @@ -248,7 +248,7 @@ mp3_read_frame(struct audio_file *fd) data->mframe.header = data->mheader; return (0); } - + if (!MAD_RECOVERABLE(data->mstream.error) && (data->mstream.error != MAD_ERROR_BUFLEN)) { /* Unrecoverable error - bail out */ @@ -345,7 +345,7 @@ mp3_open(struct audio_file *fd, const char *ext) mp3_rewind(fd); if (!fd->stream) mp3_calc_length(fd); - + return (0); } @@ -353,7 +353,7 @@ void mp3_close(struct audio_file *fd) { struct mp3_drv_data *data = fd->drv_data; - + mad_frame_finish(&data->mframe); mad_stream_finish(&data->mstream); mad_synth_finish(&data->msynth); @@ -418,7 +418,7 @@ mp3_seek(struct audio_file *fd, int len, int rel) /* Calculate the new relative position */ len = CLAMP(len, 0, (int)fd->time_len); newpos = ((double)len / fd->time_len) * data->flen; - + /* Seek to the new position */ mp3_rewind(fd); fseek(fd->fp, newpos, SEEK_SET); diff --git a/herrie/src/audio_format_sndfile.c b/herrie/src/audio_format_sndfile.c index 1aee1bb..8154500 100644 --- a/herrie/src/audio_format_sndfile.c +++ b/herrie/src/audio_format_sndfile.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -80,7 +80,7 @@ sndfile_read(struct audio_file *fd, int16_t *buf, size_t len) { SNDFILE *hnd = fd->drv_data; sf_count_t ret, frame; - + ret = sf_read_short(hnd, buf, len); /* Seek zero frames to obtain the current position */ diff --git a/herrie/src/audio_format_vorbis.c b/herrie/src/audio_format_vorbis.c index 614b12e..29c5182 100644 --- a/herrie/src/audio_format_vorbis.c +++ b/herrie/src/audio_format_vorbis.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -51,7 +51,7 @@ vorbis_read_comments(struct audio_file *fd) if ((cmt = ov_comment(vfp, -1)) == NULL) return; - + for (i = 0; i < cmt->comments; i++) { tag = cmt->user_comments[i]; @@ -91,7 +91,7 @@ vorbis_open(struct audio_file *fd, const char *ext) fd->time_len = ov_time_total(vfp, -1); vorbis_read_comments(fd); - + return (0); } @@ -114,7 +114,7 @@ vorbis_read(struct audio_file *fd, int16_t *buf, size_t len) size_t ret = 0; long rlen; char *out = (char *)buf; - + len *= sizeof(int16_t); /* Return 16 bits signed native endian */ diff --git a/herrie/src/audio_output.h b/herrie/src/audio_output.h index ee8b958..be9261c 100644 --- a/herrie/src/audio_output.h +++ b/herrie/src/audio_output.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/audio_output_alsa.c b/herrie/src/audio_output_alsa.c index e1988d3..061ea42 100644 --- a/herrie/src/audio_output_alsa.c +++ b/herrie/src/audio_output_alsa.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -96,7 +96,7 @@ audio_output_apply_hwparams(void) /* Apply values */ if (snd_pcm_hw_params(devhnd, devparam) != 0) return (-1); - + return (0); } @@ -160,7 +160,7 @@ audio_output_play(struct audio_file *fd) if ((len = audio_file_read(fd, buf, sizeof buf / sizeof(int16_t))) == 0) return (-1); - + if (fd->channels != channels || fd->srate != srate) { /* Apply the new values */ channels = fd->channels; diff --git a/herrie/src/audio_output_ao.c b/herrie/src/audio_output_ao.c index 12b9115..282c949 100644 --- a/herrie/src/audio_output_ao.c +++ b/herrie/src/audio_output_ao.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/audio_output_coreaudio.c b/herrie/src/audio_output_coreaudio.c index 4732846..99468ee 100644 --- a/herrie/src/audio_output_coreaudio.c +++ b/herrie/src/audio_output_coreaudio.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -131,7 +131,7 @@ audio_output_ioproc(AudioDeviceID inDevice, const AudioTimeStamp *inNow, /* Fill the trailer with zero's */ for (; i < abuflen; i++) ob[i] = 0.0; - + return (0); } @@ -143,7 +143,7 @@ audio_output_open(void) /* Obtain the audio device ID */ size = sizeof adid; if (AudioHardwareGetProperty( - kAudioHardwarePropertyDefaultOutputDevice, + kAudioHardwarePropertyDefaultOutputDevice, &size, &adid) != 0 || adid == kAudioDeviceUnknown) goto error; @@ -205,7 +205,7 @@ audio_output_play(struct audio_file *fd) { UInt32 len, size; int16_t *tmp; - + /* Read data in our temporary buffer */ if ((len = audio_file_read(fd, abufnew, abuflen)) == 0) return (-1); @@ -233,7 +233,7 @@ audio_output_play(struct audio_file *fd) while (g_atomic_int_get(&abufulen) != 0) g_cond_wait(abufdrained, abuflock); g_mutex_unlock(abuflock); - + /* Toggle the buffers */ tmp = abufcur; abufcur = abufnew; diff --git a/herrie/src/audio_output_null.c b/herrie/src/audio_output_null.c index 34bd5f2..d63ef26 100644 --- a/herrie/src/audio_output_null.c +++ b/herrie/src/audio_output_null.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -48,7 +48,7 @@ audio_output_play(struct audio_file *fd) if ((len = audio_file_read(fd, buf, sizeof buf / sizeof(int16_t))) == 0) return (-1); - + /* This should just fit - 2^12 * 10^6 < 2^32 */ delay = (1000000 * len) / (fd->srate * fd->channels); g_usleep(delay); diff --git a/herrie/src/audio_output_oss.c b/herrie/src/audio_output_oss.c index 0c17db0..d109677 100644 --- a/herrie/src/audio_output_oss.c +++ b/herrie/src/audio_output_oss.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -117,7 +117,7 @@ audio_output_play(struct audio_file *fd) len *= sizeof(int16_t); if (write(dev_fd, buf, len) != len) return (-1); - + return (0); bad: gui_msgbar_warn(_("Sample rate or amount of channels not supported.")); @@ -149,7 +149,7 @@ audio_output_volume_adjust(int n) if (ioctl(dev_fd, SNDCTL_DSP_GETPLAYVOL, &vol) == -1) #endif return (-1); - + /* XXX: Merge left and right */ vol = ((vol & 0x7f) + ((vol >> 8) & 0x7f)) / 2; vol = CLAMP(vol + n, 0, 100); diff --git a/herrie/src/audio_output_pulse.c b/herrie/src/audio_output_pulse.c index d2683f6..0dc3a03 100644 --- a/herrie/src/audio_output_pulse.c +++ b/herrie/src/audio_output_pulse.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/config.c b/herrie/src/config.c index c5f6293..b7a969e 100644 --- a/herrie/src/config.c +++ b/herrie/src/config.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -94,7 +94,7 @@ valid_md5(char *val) if (val[0] == '\0') return (0); - + for (i = 0; i < 32; i++) { /* Silently convert hash to lowercase */ val[i] = g_ascii_tolower(val[i]); @@ -196,7 +196,7 @@ static struct config_entry configlist[] = { /** * @brief The amount of configuration switches available. */ -#define NUM_SWITCHES (sizeof configlist / sizeof(struct config_entry)) +#define NUM_SWITCHES (sizeof configlist / sizeof(struct config_entry)) /** * @brief Search for an entry in the configlist by name. @@ -233,7 +233,7 @@ config_setopt(const char *opt, char *val) if ((ent = config_search(opt)) == NULL) return (-1); - + if (strcmp(val, ent->defval) != 0) { /* Just unset the value when it's the default */ @@ -287,10 +287,10 @@ const char * config_getopt(const char *opt) { struct config_entry *ent; - + ent = config_search(opt); g_assert(ent != NULL); - + /* Return the default if it is unset */ return (ent->curval ? ent->curval : ent->defval); } @@ -299,7 +299,7 @@ int config_getopt_bool(const char *val) { int bval; - + bval = string_to_bool(config_getopt(val)); g_assert(bval != -1); return (bval); @@ -309,7 +309,7 @@ int config_getopt_color(const char *val) { int col; - + col = gui_draw_color_number(config_getopt(val)); g_assert(col >= -1); return (col); diff --git a/herrie/src/config.h b/herrie/src/config.h index af628dc..f60a165 100644 --- a/herrie/src/config.h +++ b/herrie/src/config.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/conftest.c b/herrie/src/conftest.c index 9df0a73..db40b59 100644 --- a/herrie/src/conftest.c +++ b/herrie/src/conftest.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/dbus.c b/herrie/src/dbus.c index ff235c1..6c3c8fc 100644 --- a/herrie/src/dbus.c +++ b/herrie/src/dbus.c @@ -4,7 +4,7 @@ * * Copyright (c) 2008 Steve Jothen * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -13,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -96,7 +96,7 @@ dbus_runner_thread(void *unused) guint ret; gui_input_sigmask(); - + g_type_init(); ds = g_object_new(dbus_server_get_type(), NULL); loop = g_main_loop_new(NULL, FALSE); diff --git a/herrie/src/dbus.h b/herrie/src/dbus.h index bd5628b..6fd97df 100644 --- a/herrie/src/dbus.h +++ b/herrie/src/dbus.h @@ -4,7 +4,7 @@ * * Copyright (c) 2008 Steve Jothen * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -13,7 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/gui.h b/herrie/src/gui.h index b420780..3fcbf47 100644 --- a/herrie/src/gui.h +++ b/herrie/src/gui.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/gui_browser.c b/herrie/src/gui_browser.c index 20ebf73..b52e329 100644 --- a/herrie/src/gui_browser.c +++ b/herrie/src/gui_browser.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -230,7 +230,7 @@ gui_browser_gotofile(struct vfsref *vr) vfs_close(vrp); goto bad; } - + for (vrn = vfs_list_first(vfs_population(vrp)), idx = 1; vrn != NULL; vrn = vfs_list_next(vrn), idx++) { /* Select the previous directory */ @@ -258,7 +258,7 @@ gui_browser_dir_parent(void) if (vr_curdir == NULL) return; - + if (locatestr != NULL) { /* First unset the filter if we have one */ gui_browser_cleanup_flist(); @@ -475,7 +475,7 @@ gui_browser_locate(const struct vfsmatch *vm) vfs_locate(&vl, vr_curdir, vm); if (vfs_list_empty(&vl)) return (-1); - + gui_browser_cleanup_flist(); locatestr = g_strdup(vfs_match_value(vm)); vfs_list_move(&vl_flist, &vl); diff --git a/herrie/src/gui_draw.c b/herrie/src/gui_draw.c index 5a91ee1..b685cab 100644 --- a/herrie/src/gui_draw.c +++ b/herrie/src/gui_draw.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -147,7 +147,7 @@ gui_draw_color_number(const char *name) else if (strcmp(name, "default") == 0) return (-1); #endif /* NCURSES_VERSION */ - + return (-2); } diff --git a/herrie/src/gui_input.c b/herrie/src/gui_input.c index 19fc21f..11e8e18 100644 --- a/herrie/src/gui_input.c +++ b/herrie/src/gui_input.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -193,7 +193,7 @@ gui_input_asksearch(void) str = gui_input_askstring(_("Search for"), old, NULL); if (str == NULL) return (-1); - + vm = vfs_match_new(str); if (vm == NULL) { gui_msgbar_warn(_("Bad pattern.")); @@ -432,7 +432,7 @@ struct gui_binding { */ int focus; /** - * @brief The character that should be pressed. + * @brief The character that should be pressed. */ int input; /** diff --git a/herrie/src/gui_internal.h b/herrie/src/gui_internal.h index e3c674b..7fe4288 100644 --- a/herrie/src/gui_internal.h +++ b/herrie/src/gui_internal.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/gui_msgbar.c b/herrie/src/gui_msgbar.c index 2f5529d..b6e5f37 100644 --- a/herrie/src/gui_msgbar.c +++ b/herrie/src/gui_msgbar.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/gui_playq.c b/herrie/src/gui_playq.c index 5bf0b6a..b4ccb4a 100644 --- a/herrie/src/gui_playq.c +++ b/herrie/src/gui_playq.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -237,7 +237,7 @@ gui_playq_song_update(struct audio_file *fd, int paused, int timeonly) /* Print same message in ps(1) */ setproctitle("%s %s%s", str_status, str_song->str, str_time->str); #endif /* BUILD_SETPROCTITLE */ - + gui_playq_statbar_refresh(); gui_draw_done(); } @@ -249,7 +249,7 @@ gui_playq_resize(void) wresize(win_statbar, 1, COLS); clearok(win_statbar, TRUE); gui_unlock(); - + playq_lock(); gui_vfslist_move(win_playq, 0, 1, COLS, GUI_SIZE_PLAYQ_HEIGHT); playq_unlock(); @@ -493,7 +493,7 @@ gui_playq_searchnext(const struct vfsmatch *vm) playq_lock(); ret = gui_vfslist_searchnext(win_playq, vm); playq_unlock(); - + return (ret); } diff --git a/herrie/src/gui_vfslist.c b/herrie/src/gui_vfslist.c index 664e3ab..e7910af 100644 --- a/herrie/src/gui_vfslist.c +++ b/herrie/src/gui_vfslist.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -232,7 +232,7 @@ gui_vfslist_new(int shownumbers) struct gui_vfslist *ret; scrollpages = config_getopt_bool("gui.vfslist.scrollpages"); - + ret = g_slice_new0(struct gui_vfslist); ret->shownumbers = shownumbers; @@ -340,7 +340,7 @@ void gui_vfslist_cursor_down(struct gui_vfslist *gv, int silent) { struct vfsref *vr; - + if (gui_vfslist_warn_isempty(gv)) return; @@ -411,7 +411,7 @@ gui_vfslist_cursor_pageup(struct gui_vfslist *gv) gv->vr_selected = gv->vr_top; gv->idx_selected = gv->idx_top; } - + gui_vfslist_refresh(gv); } @@ -429,7 +429,7 @@ gui_vfslist_cursor_pagedown(struct gui_vfslist *gv) gv->vr_top = vfs_list_next(gv->vr_top); gv->idx_top++; } - + if (gv->vr_top == NULL) { gv->vr_top = vfs_list_last(gv->list); gv->idx_top = vfs_list_items(gv->list); @@ -607,7 +607,7 @@ gui_vfslist_fullpath(struct gui_vfslist *gv) if (gui_vfslist_warn_isempty(gv)) return; - + msg = g_strdup_printf("%s: %s", _("Full pathname"), vfs_filename(gv->vr_selected)); gui_msgbar_warn(msg); diff --git a/herrie/src/gui_vfslist.h b/herrie/src/gui_vfslist.h index 168a8ba..d41e904 100644 --- a/herrie/src/gui_vfslist.h +++ b/herrie/src/gui_vfslist.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/main.c b/herrie/src/main.c index 082cd9b..1adff33 100644 --- a/herrie/src/main.c +++ b/herrie/src/main.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/md5.c b/herrie/src/md5.c index 1cab1f5..f65a614 100644 --- a/herrie/src/md5.c +++ b/herrie/src/md5.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/md5.h b/herrie/src/md5.h index 8f88632..f4c619c 100644 --- a/herrie/src/md5.h +++ b/herrie/src/md5.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/playq.c b/herrie/src/playq.c index 0fc53af..50133da 100644 --- a/herrie/src/playq.c +++ b/herrie/src/playq.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -487,7 +487,7 @@ void playq_song_fast_move_up(struct vfsref *vr, unsigned int index) { struct vfsref *pvr; - + /* Remove the item above */ pvr = vfs_list_prev(vr); gui_playq_notify_pre_removal(index - 1); @@ -596,7 +596,7 @@ playq_song_randomize(void) do { /* Pick a random item from the beginning */ idx = g_rand_int_range(playq_rand, 0, remaining); - + /* Add it to the list */ vfs_list_insert_tail(&playq_list, vrlist[idx]); /* Remove fragmentation */ diff --git a/herrie/src/playq.h b/herrie/src/playq.h index a4f672d..6e935ba 100644 --- a/herrie/src/playq.h +++ b/herrie/src/playq.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/playq_modules.h b/herrie/src/playq_modules.h index 968194e..7c98b1c 100644 --- a/herrie/src/playq_modules.h +++ b/herrie/src/playq_modules.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/playq_party.c b/herrie/src/playq_party.c index 0a0466b..4a02ce8 100644 --- a/herrie/src/playq_party.c +++ b/herrie/src/playq_party.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/playq_xmms.c b/herrie/src/playq_xmms.c index f21393a..8c2e753 100644 --- a/herrie/src/playq_xmms.c +++ b/herrie/src/playq_xmms.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -126,6 +126,6 @@ playq_xmms_notify_pre_removal(struct vfsref *vr) /* Remove dangling pointers */ if (cursong == vr) cursong = NULL; - + g_assert(selectsong != vr); } diff --git a/herrie/src/scrobbler.c b/herrie/src/scrobbler.c index c6826ef..62541b5 100644 --- a/herrie/src/scrobbler.c +++ b/herrie/src/scrobbler.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -160,7 +160,7 @@ scrobbler_notify_read(struct audio_file *fd, int eof) /* Don't accept streams or submit songs twice */ if (!scrobbler_enabled || fd->stream || fd->_scrobbler_done) return; - + if (eof) { /* Just take the position - catches formats without seeking */ len = fd->time_cur; @@ -176,7 +176,7 @@ scrobbler_notify_read(struct audio_file *fd, int eof) /* Track was too short */ if (len < 30) return; - + /* Mark it as processed */ fd->_scrobbler_done = 1; @@ -222,7 +222,7 @@ scrobbler_queue_fetch(const char key[32], char **poststr) str = g_string_new("s="); g_string_append_len(str, key, 32); - + /* We can submit 50 tracks at a time */ for (len = 0; (len < 50) && (ent != NULL); len++) { g_string_append_printf(str, @@ -362,7 +362,7 @@ scrobbler_send_handshake(char *key, char **url) con = curl_easy_init(); if (con == NULL) return (-1); - + /* Generate the connection URL, including the password key */ hstime = time(NULL); scrobbler_hash(hstime, hskey); @@ -429,7 +429,7 @@ scrobbler_send_tracks(char *key, const char *url, const char *poststr) con = curl_easy_init(); if (con == NULL) return (-1); - + curl_easy_setopt(con, CURLOPT_URL, url); curl_easy_setopt(con, CURLOPT_POSTFIELDS, poststr); curl_easy_setopt(con, CURLOPT_USERAGENT, APP_NAME "/" APP_VERSION); @@ -528,7 +528,7 @@ scrobbler_runner_thread(void *unused) /* Make sure we don't transmit too fast */ g_usleep(interval * 1000000); } - + g_assert_not_reached(); return (NULL); } @@ -553,13 +553,13 @@ scrobbler_queue_dump(void) filename = config_getopt("scrobbler.dumpfile"); if (filename[0] == '\0') return; - + /* Nothing to be stored - remove queue */ if (scrobbler_queue_first == NULL) { vfs_delete(filename); return; } - + /* Write list to queue file */ fp = vfs_fopen(filename, "w"); if (fp == NULL) @@ -586,7 +586,7 @@ scrobbler_queue_restore(void) filename = config_getopt("scrobbler.dumpfile"); if (filename[0] == '\0') return; - + if ((fio = vfs_fopen(filename, "r")) == NULL) return; @@ -612,7 +612,7 @@ scrobbler_queue_restore(void) goto bad; (*nse)->length = strtoul(s1, NULL, 10); (*nse)->time = strtol(++s2, NULL, 10); - + /* Properly fix up the list */ scrobbler_queue_last = *nse; nse = &(*nse)->next; @@ -636,7 +636,7 @@ scrobbler_spawn(void) /* Restore unsubmitted tracks */ scrobbler_queue_restore(); - + scrobbler_runner = g_thread_create(scrobbler_runner_thread, NULL, 0, NULL); scrobbler_enabled = 1; diff --git a/herrie/src/scrobbler.h b/herrie/src/scrobbler.h index ad9a3da..ef1adf7 100644 --- a/herrie/src/scrobbler.h +++ b/herrie/src/scrobbler.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/stdinc.h b/herrie/src/stdinc.h index 5887a87..32a21ae 100644 --- a/herrie/src/stdinc.h +++ b/herrie/src/stdinc.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/util.c b/herrie/src/util.c index 94f52d1..ac7885e 100644 --- a/herrie/src/util.c +++ b/herrie/src/util.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/util.h b/herrie/src/util.h index 97404cb..14a1096 100644 --- a/herrie/src/util.h +++ b/herrie/src/util.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/vfs.c b/herrie/src/vfs.c index 34c3ffc..5abf80c 100644 --- a/herrie/src/vfs.c +++ b/herrie/src/vfs.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -347,10 +347,10 @@ vfs_close(struct vfsref *vr) vfs_list_remove(&vr->ent->population, cur); vfs_close(cur); } - + vfs_dealloc(vr->ent); } - + /* Deallocate the reference to it */ g_slice_free(struct vfsref, vr); } @@ -420,7 +420,7 @@ vfs_write_playlist(const struct vfslist *vl, const struct vfsref *vr, fn = vfs_path_concat(base, filename, 0); if (fn == NULL) return (NULL); - + /* Search for a matching extension */ for (i = 0; i < NUM_WRITERS; i++) { if (g_str_has_suffix(fn, writers[i].ext)) { @@ -452,7 +452,7 @@ vfs_delete(const char *filename) fn = vfs_path_concat(NULL, filename, 0); if (fn == NULL) return (-1); - + ret = unlink(fn); g_free(fn); @@ -468,7 +468,7 @@ vfs_fopen(const char *filename, const char *mode) fn = vfs_path_concat(NULL, filename, 0); if (fn == NULL) return (NULL); - + ret = fopen(fn, mode); g_free(fn); @@ -482,7 +482,7 @@ vfs_fgets(char *str, size_t size, FILE *fp) if (fgets(str, size, fp) == NULL) return (-1); - + eol = strchr(str, '\0'); g_assert(eol != NULL); @@ -509,7 +509,7 @@ vfs_match_new(const char *str) return (NULL); } vm->string = g_strdup(str); - + return (vm); } diff --git a/herrie/src/vfs.h b/herrie/src/vfs.h index fb49981..e20686d 100644 --- a/herrie/src/vfs.h +++ b/herrie/src/vfs.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/vfs_cache.c b/herrie/src/vfs_cache.c index 1d37f99..1a6de50 100644 --- a/herrie/src/vfs_cache.c +++ b/herrie/src/vfs_cache.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/vfs_http.c b/herrie/src/vfs_http.c index 6aa0661..856dbc8 100644 --- a/herrie/src/vfs_http.c +++ b/herrie/src/vfs_http.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/vfs_modules.h b/herrie/src/vfs_modules.h index b3139bc..c5b5a1c 100644 --- a/herrie/src/vfs_modules.h +++ b/herrie/src/vfs_modules.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/herrie/src/vfs_playlist.c b/herrie/src/vfs_playlist.c index 3700ab2..88bbace 100644 --- a/herrie/src/vfs_playlist.c +++ b/herrie/src/vfs_playlist.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -62,7 +62,7 @@ vfs_pls_match(struct vfsent *ve, int isdir) /* In order to speed up the process, we only match *.pls */ if (isdir || !g_str_has_suffix(ve->name, ".pls")) return (-1); - + ve->recurse = 0; return (0); } @@ -130,7 +130,7 @@ vfs_pls_populate(struct vfsent *ve) fclose(fio); g_free(dn); - + return (0); } @@ -146,7 +146,7 @@ vfs_pls_write(const struct vfslist *vl, const char *filename) fio = fopen(filename, "w"); if (fio == NULL) return (-1); - + /* Directory name length of .pls filename */ base = strrchr(filename, G_DIR_SEPARATOR); g_assert(base != NULL); @@ -235,7 +235,7 @@ vfs_m3u_write(const struct vfslist *vl, const char *filename) fio = fopen(filename, "w"); if (fio == NULL) return (-1); - + /* Directory name length of .meu filename */ base = strrchr(filename, G_DIR_SEPARATOR); g_assert(base != NULL); diff --git a/herrie/src/vfs_regular.c b/herrie/src/vfs_regular.c index 7bffe59..3713db8 100644 --- a/herrie/src/vfs_regular.c +++ b/herrie/src/vfs_regular.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -55,7 +55,7 @@ vfs_dir_match(struct vfsent *ve, int isdir) if (!isdir) return (-1); - + #ifdef S_ISLNK /* Disallow recursing on symlinked directories */ if (lstat(ve->filename, &fs) != 0) @@ -79,7 +79,7 @@ vfs_dir_populate(struct vfsent *ve) if ((dir = g_dir_open(ve->filename, 0, NULL)) == NULL) return (-1); - + while ((sfn = g_dir_read_name(dir)) != NULL) { /* Hide dotted files */ if (hide_dotfiles && sfn[0] == '.') diff --git a/herrie/src/vfs_xspf.c b/herrie/src/vfs_xspf.c index 38644fe..3d2075a 100644 --- a/herrie/src/vfs_xspf.c +++ b/herrie/src/vfs_xspf.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2011 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -75,7 +75,7 @@ vfs_xspf_populate(struct vfsent *ve) vfs_list_insert_tail(&ve->population, vr); } } - + g_free(dirname); xspf_free(slist); return (0); diff --git a/misc/cdepcalc.c b/misc/cdepcalc.c index 422612b..e20ace8 100644 --- a/misc/cdepcalc.c +++ b/misc/cdepcalc.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2006-2008 Ed Schouten * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -197,7 +197,7 @@ main(int argc, char *argv[]) file_scan(fent->d_name); } closedir(srcdir); - + out = fopen("../depends", "w"); if (out == NULL) { fprintf(stderr, "Failed to open output file\n"); diff --git a/www/index.html b/www/index.html index e8c330a..e1489e9 100644 --- a/www/index.html +++ b/www/index.html @@ -10,35 +10,35 @@ margin: 0px; color: black; } - + a { color: #029; } - + a:hover { color: #04F; } - + /* The header section */ div#header { background-color: #05a; padding: 10px; } - + div#header span#title { font-family: monospace; font-size: 30px; font-weight: bold; color: white; } - + div#header span#subtitle { margin-left: 10px; font-weight: bold; font-style: italic; color: #ccc; } - + /* The menu section */ div#menu { width: 250px; @@ -48,7 +48,7 @@ background-color: white; float: left; } - + /* The main section */ div#main { margin-left: 310px; @@ -57,11 +57,11 @@ padding: 30px; background-color: white; } - + div#main h2 { margin-left: 10px; } - + div#main p,ul,pre { margin-left: 10px; } @@ -77,7 +77,7 @@ Herrie a minimalistic music player - + - +

Herrie is a minimalistic music player that uses the command line. It is written to support a variety of operating systems, audio subsystems and file formats, including playlists.

- +

Herrie has a split-screen user interface, with a playlist at the top of the screen and a file browser at the bottom. When tracks are added to the playlist, Herrie consumes them from the top one by one. It is thus an application that allows you to batch music for playback.

- +

Herrie also has some more exotic features, including support for AudioScrobbler and the ability to chroot() itself into a @@ -121,9 +121,9 @@ href="trophees-du-libre.pdf">published online.

Screenshots

- +

Below are a couple of screenshots of the application in action.

- +
Herrie on FreeBSD, playing a CD from Deftones.

Herrie on FreeBSD, playing a CD from Deftones.

@@ -134,14 +134,14 @@ Herrie through Cygwin on Windows Vista, playing the background music from NeverBall.

Herrie through Cygwin on Windows Vista, playing the background music from NeverBall.

- +

Obtaining Herrie

- +

Source tarballs

- +

Herrie 2.2 is available for download at one of the three following locations:

- +
  • herrie.info: bzip2 @@ -152,9 +152,9 @@ gzip
- +

Below are the checksums for the tarball:

- + 
MD5    (herrie-2.2.tar.bz2) = 88832b10298ab89473730eb0c93b6ddf
 SHA256 (herrie-2.2.tar.bz2) = 142341072920f86b6eb570b8f13bf5fd87c06cf801543dc7d1a819e39eb9fb2b
 SIZE   (herrie-2.2.tar.bz2) = 71596
@@ -175,12 +175,12 @@ SIZE   (herrie-2.2.tar.gz ) = 84843

A history of changes between releases can be found in the ChangeLog.

- +

Package managers

- +

The following operating systems or distributions include Herrie in their package manager:

- + - +

Anonymous repository access

- +

Herrie's latest sourcecode can be downloaded using Git. The following command downloads the latest sourcecode:

- + 
git clone git://git.80386.nl/herrie
- +

It is also possible to take a look at the sourcecode using CGit.

- +

Using Herrie

- +

After installation, a new manual page is available. Just run man herrie for a list of configuration switches and keyboard bindings. An online manual page is also available.

- +

Developers can take a look at the source code documentation generated by Doxygen.

- +

Contacting the author

The author of Herrie, Ed Schouten, can be emailed at