J. Alexander Treuman
87327cb931
Instead of ignoring mp2/mp3 files that start with a layer 1 frame, just skip the layer 1 frames looking for a layer 2 or 3 frame.
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4671 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-08-23 14:06:16 +00:00
J. Alexander Treuman
30bf8f89f4
If a frame header decode loses sync, just try again instead of trying to decode a frame (which will automatically decode the next header without allowing us to do some checks on it).
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4670 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-08-23 13:43:23 +00:00
J. Alexander Treuman
103dd654f0
Skip layer 2 frames in mp3s and vice versa. Also drop support for layer 1, since it hasn't been tested.
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4669 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-08-23 13:20:24 +00:00
Eric Wong
ee223bf02b
trivial: labels should be on the left-most column, no tabbing
...
Unfortunately there doesn't seem to be an indent switch for this,
but we have find + perl:
find src -name '*.[ch]' | xargs perl -i -p -e \
's/^\s+(\w+):/$1:/g unless /^\s+default:/'
This is a followup to r4605, and there are no actual code
changes in this.
git-svn-id: https://svn.musicpd.org/mpd/trunk@4661 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-08-20 10:13:54 +00:00
J. Alexander Treuman
4fe965c304
Stop decoding once we've dropped samples at the end (it messes up the audio if there's more mp3 to decode)
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4619 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-08-13 02:56:23 +00:00
J. Alexander Treuman
66512edb6c
Presume that the Xing frame count is accurate, and stop decoding when we hit the last frame
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4618 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-08-13 02:53:20 +00:00
Eric Wong
5aca21a502
Several fixes uncovered with -pedantic
...
playerData.c:
proper error checking
directory.c:
properly check myFgets() for errors
(it returns NULL on error)
inputPlugins/mp3_plugin.c
get rid of commas at the end of enums
interface.c:
we weren't using long long, so strtoll isn't needed
get rid of void-pointer arithmetic
sllist.c:
get rid of void-pointer arithmetic
compress.c:
get rid of C++ comments, some compilers don't accept them
Note that I personally like void pointer arithmetic, but some
ancient compilers don't support them :(
git-svn-id: https://svn.musicpd.org/mpd/trunk@4510 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-08-01 04:18:41 +00:00
J. Alexander Treuman
2fa3e8ab26
Silence a gcc warning... Properly.
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4469 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-26 03:31:21 +00:00
J. Alexander Treuman
faa3debe8e
Silence a gcc warning
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4468 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-26 03:28:43 +00:00
J. Alexander Treuman
f2088bf869
jat's second tip of the day: when you change a ternary operator to an if, don't forget to take out everything after the :. And don't forget my first tip either.
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4467 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-26 03:25:29 +00:00
J. Alexander Treuman
a570f8d9a9
Screw this found_* stuff, just wrap parse_*() in an if
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4465 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-26 03:17:30 +00:00
J. Alexander Treuman
13cca01c7b
Don't decode the first frame if it has a xing tag, not only if it has a xing tag with a frame count
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4464 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-26 03:14:19 +00:00
J. Alexander Treuman
b926dd100b
Use the lame tag's encoder delay/padding to implement gapless mp3 playback
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4462 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-26 03:10:19 +00:00
J. Alexander Treuman
1523e8a842
Parse lame tag for encoder delay/padding so we can later implement gapless
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4460 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-25 22:49:10 +00:00
J. Alexander Treuman
a686436c77
jat's tip of the day: remember to remove your silly debug messages before committing
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4459 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-25 22:22:48 +00:00
J. Alexander Treuman
356f16a877
Add support for mp1/2. Thanks to Stephan Beyer for the patch.
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4458 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-25 22:08:55 +00:00
J. Alexander Treuman
073970ec4a
Removing my stupid debug messages for testing xing
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4457 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-25 20:09:24 +00:00
J. Alexander Treuman
e65fb6e14f
Reworking xing parsing so lame tags will fit in better
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4456 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-25 20:08:22 +00:00
J. Alexander Treuman
0979b0f75e
Thanks for making my code totally unreadable indent!
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4455 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-25 19:08:46 +00:00
Avuton Olrich
00e67be7c9
Add mpd-indent.sh
...
Add a few new options for indent to try to make
things a bit cleaner
git-svn-id: https://svn.musicpd.org/mpd/trunk@4411 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-20 18:53:56 +00:00
Avuton Olrich
29a25b9933
Add mpd-indent.sh
...
Indent the entire tree, hopefully we can keep
it indented.
git-svn-id: https://svn.musicpd.org/mpd/trunk@4410 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-20 16:02:40 +00:00
J. Alexander Treuman
ec19a53f23
Fix VBR mp3 seek accuracy bug
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4399 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-18 23:28:25 +00:00
J. Alexander Treuman
6ea0ba392a
Cleaned up parse_xing, added support for Info magic, and added a parse_extension_headers function for when LAME tag support is added
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4398 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-18 18:18:02 +00:00
J. Alexander Treuman
e7566b9643
Reindenting parse_xing, since I need to work on it and it's a mess
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4397 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-18 16:28:58 +00:00
Eric Wong
6f013cd9c4
inputPlugins/*_plugin.c: static-fication
...
Nothing here is ever exported for linkage besides the
InputPlugin structure, so mark them static to save a few bytes.
git-svn-id: https://svn.musicpd.org/mpd/trunk@4382 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-17 01:47:32 +00:00
Avuton Olrich
2001db8c18
Remove hosted libid3tag & libmad
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4369 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-16 17:49:15 +00:00
J. Alexander Treuman
2fa7125cce
Change shank's email address
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4333 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-14 19:37:45 +00:00
Avuton Olrich
a37348a74f
Huge header update, update the copyright and add
...
the GPL header where necessary
git-svn-id: https://svn.musicpd.org/mpd/trunk@4317 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-13 19:20:34 +00:00
J. Alexander Treuman
e2a14f5b9e
Cleanup id3 ReplayGain parsing code.
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4280 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-06-21 16:38:18 +00:00
J. Alexander Treuman
fd6696e46a
Silly jat, don't use newMpdTag as a variable name!
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4279 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-06-21 16:22:46 +00:00
J. Alexander Treuman
c6dbba6c5d
Cleanup mp3_parseId3Tag to only modify the MpdTag if we have something new to replace it with.
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4278 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-06-21 16:11:07 +00:00
J. Alexander Treuman
bdf4107117
Rewrote id3Dup to search for tags manually. Now libid3tag will actually tell us the version of the tag we got. As an added benefit we also do fewer reads/mallocs when scanning mp3s during database update/creation.
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4277 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-06-21 15:12:41 +00:00
J. Alexander Treuman
c9b3498a2d
Work around a stupid bug in libmad so VBR MP3s with CRC protection have the correct length.
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@4184 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-05-15 13:48:47 +00:00
Eric Wong
6963502213
merge with mpd/trunk up to r3925
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@3926 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-03-16 06:52:46 +00:00
Qball Cow
03c60a28e2
fix for mp3 replaygaine
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@3852 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-01-21 17:52:14 +00:00
Qball Cow
971bf39784
Replay gain for mp3. (Patch cleaned up and provided by Jat)
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@3826 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-01-14 22:47:16 +00:00
Qball Cow
edcfbef90d
Patch to make the configure flag for mpd-mad and mpd-libid3tag more logic (from ticho)
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@3477 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-09-08 21:08:02 +00:00
Warren Dukes
5327a8f421
when filling mp3 buffer, check if its already full. If it is, then give up trying to read in a potential mp3 frame, cause no mp3 frame should be bigger than the input buffer
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@2950 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-02-14 00:52:29 +00:00
Warren Dukes
c5d27d8eaa
merge changes from metadata-rewrite branch
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@2589 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-10 21:58:27 +00:00
Warren Dukes
54679d9028
rewrite replaygain code, needs testing
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@2482 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-02 19:56:59 +00:00
Warren Dukes
cdb6372049
1) fix bug, id3_tag_parse does may return NULL if there's an error in decoding the id3v2 tag
...
2) in the same place, delete the id3Tag (fixes a memory leak)
3) version: 0.12.0 -> 0.11.4
git-svn-id: https://svn.musicpd.org/mpd/trunk@1903 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-07-24 02:54:19 +00:00
Warren Dukes
643d7e77b1
for mp3's, skip all initial frames that aren't layer 3 so we can be sure to
...
get the correct bitrate for computing the song length
git-svn-id: https://svn.musicpd.org/mpd/trunk@1783 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-07-03 14:33:21 +00:00
Warren Dukes
26741dcdeb
fix for when trying to seek past the end of an mp3
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1782 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-07-03 14:13:43 +00:00
Warren Dukes
9db4044fbd
fix poping at the beginng of mp3's
...
Theory: in previous versions, dither struct was static, which by definetion means its initiallized as all O's. However, i removed static from the dither structbut then its not initialized. Thus dithering started with some random stuff in the bit buckets. Should be fixed now.
git-svn-id: https://svn.musicpd.org/mpd/trunk@1578 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-20 01:37:18 +00:00
Warren Dukes
486d4acfb2
put CHUNK_SIZE back
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1577 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-20 00:50:21 +00:00
Warren Dukes
dbd79a6b47
fix a few bugs in mp3_decode and minimize alsa underruns by playing silence when switch songs
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1572 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-19 22:27:29 +00:00
Warren Dukes
7f15536683
DEBUG message
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1571 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-19 21:31:53 +00:00
Warren Dukes
283e34eaae
icy metadata! wahoo
...
still lots some debug code with print out's, so don't bitch about it!
git-svn-id: https://svn.musicpd.org/mpd/trunk@1364 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-07 05:00:56 +00:00
Warren Dukes
4e53282469
todo update
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1352 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-06 16:42:14 +00:00
Warren Dukes
3f5d9a67fc
todo update
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1335 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-04 20:13:04 +00:00
Warren Dukes
15c61f6eb0
don't stop on play command!
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1313 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-03 02:56:26 +00:00
Warren Dukes
4d14e3a4dd
remove an errant AHHHH
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1284 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-01 13:36:19 +00:00
Warren Dukes
7e78fb455c
remove some debug code
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1282 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-01 12:53:25 +00:00
Warren Dukes
16da97e4c8
parsing mp3 id3v2 tags on the fly for streams
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1281 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-01 12:50:15 +00:00
Warren Dukes
d9f5cca9b8
mod_plugin, just for tarzeau
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1263 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-05-31 20:59:55 +00:00
Warren Dukes
97fe75a0bf
little cleanup of plugin stuff
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1247 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-05-31 02:21:06 +00:00
Warren Dukes
30424cb3e9
flac_plugin
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1246 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-05-31 01:54:10 +00:00
Warren Dukes
fd6aa25359
mp3 and ogg plugin stuff
...
git-svn-id: https://svn.musicpd.org/mpd/trunk@1245 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-05-31 01:21:17 +00:00