diff -Nru libaudio-scan-perl-0.99/Changes libaudio-scan-perl-1.00/Changes --- libaudio-scan-perl-0.99/Changes 2017-11-25 00:33:45.000000000 +0000 +++ libaudio-scan-perl-1.00/Changes 2018-04-21 22:01:08.000000000 +0000 @@ -2,6 +2,9 @@ Note: Bug numbers refer to bugs at http://bugs.slimdevices.com +1.00 2018-04-21 + - Fixed parsing of DSF files with more than 2 channels. + 0.99 2017-11-24 - Fixed a bug where an incorrect audio offset was returned when using NO_ARTWORK and reading a file with an ID3v2.2 or v2.3 unsynchronization bit diff -Nru libaudio-scan-perl-0.99/debian/changelog libaudio-scan-perl-1.00/debian/changelog --- libaudio-scan-perl-0.99/debian/changelog 2017-12-19 23:35:23.000000000 +0000 +++ libaudio-scan-perl-1.00/debian/changelog 2018-05-14 12:47:01.000000000 +0000 @@ -1,3 +1,17 @@ +libaudio-scan-perl (1.00-1) unstable; urgency=medium + + [ Damyan Ivanov ] + * declare conformance with Policy 4.1.3 (no changes needed) + + [ Salvatore Bonaccorso ] + * Update Vcs-* headers for switch to salsa.debian.org + + [ Florian Schlichting ] + * Import upstream version 1.00 + * Declare compliance with Debian Policy 4.1.4 + + -- Florian Schlichting Mon, 14 May 2018 14:47:01 +0200 + libaudio-scan-perl (0.99-1) unstable; urgency=medium [ Alex Muntada ] diff -Nru libaudio-scan-perl-0.99/debian/control libaudio-scan-perl-1.00/debian/control --- libaudio-scan-perl-0.99/debian/control 2017-12-19 23:35:23.000000000 +0000 +++ libaudio-scan-perl-1.00/debian/control 2018-05-14 12:46:43.000000000 +0000 @@ -8,9 +8,9 @@ perl, libtest-warn-perl, zlib1g-dev -Standards-Version: 4.1.2 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libaudio-scan-perl.git -Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libaudio-scan-perl.git +Standards-Version: 4.1.4 +Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libaudio-scan-perl +Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libaudio-scan-perl.git Homepage: https://metacpan.org/release/Audio-Scan Package: libaudio-scan-perl diff -Nru libaudio-scan-perl-0.99/lib/Audio/Scan.pm libaudio-scan-perl-1.00/lib/Audio/Scan.pm --- libaudio-scan-perl-0.99/lib/Audio/Scan.pm 2017-11-24 22:04:09.000000000 +0000 +++ libaudio-scan-perl-1.00/lib/Audio/Scan.pm 2018-04-21 22:03:13.000000000 +0000 @@ -2,7 +2,7 @@ use strict; -our $VERSION = '0.99'; +our $VERSION = '1.00'; require XSLoader; XSLoader::load('Audio::Scan', $VERSION); diff -Nru libaudio-scan-perl-0.99/MANIFEST libaudio-scan-perl-1.00/MANIFEST --- libaudio-scan-perl-0.99/MANIFEST 2017-11-25 00:36:05.000000000 +0000 +++ libaudio-scan-perl-1.00/MANIFEST 2018-04-21 22:03:56.000000000 +0000 @@ -82,6 +82,7 @@ t/dsdiff/dff128.dff t/dsdiff/dff64.dff t/dsf.t +t/dsf/6channel.dsf t/dsf/dsf128.dsf t/dsf/dsf64.dsf t/flac.t diff -Nru libaudio-scan-perl-0.99/META.json libaudio-scan-perl-1.00/META.json --- libaudio-scan-perl-0.99/META.json 2017-11-25 00:36:05.000000000 +0000 +++ libaudio-scan-perl-1.00/META.json 2018-04-21 22:03:56.000000000 +0000 @@ -4,7 +4,7 @@ "Andy Grundman " ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 7.3, CPAN::Meta::Converter version 2.150010", + "generated_by" : "ExtUtils::MakeMaker version 7.0401, CPAN::Meta::Converter version 2.150001", "license" : [ "unknown" ], @@ -37,6 +37,5 @@ } }, "release_status" : "stable", - "version" : "0.99", - "x_serialization_backend" : "JSON::PP version 2.27300_01" + "version" : "1.00" } diff -Nru libaudio-scan-perl-0.99/META.yml libaudio-scan-perl-1.00/META.yml --- libaudio-scan-perl-0.99/META.yml 2017-11-25 00:36:05.000000000 +0000 +++ libaudio-scan-perl-1.00/META.yml 2018-04-21 22:03:56.000000000 +0000 @@ -7,7 +7,7 @@ configure_requires: ExtUtils::MakeMaker: '0' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 7.3, CPAN::Meta::Converter version 2.150010' +generated_by: 'ExtUtils::MakeMaker version 7.0401, CPAN::Meta::Converter version 2.150001' license: unknown meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -19,5 +19,4 @@ - inc requires: Test::Warn: '0' -version: '0.99' -x_serialization_backend: 'CPAN::Meta::YAML version 0.018' +version: '1.00' diff -Nru libaudio-scan-perl-0.99/src/dsf.c libaudio-scan-perl-1.00/src/dsf.c --- libaudio-scan-perl-0.99/src/dsf.c 2017-11-24 22:51:37.000000000 +0000 +++ libaudio-scan-perl-1.00/src/dsf.c 2018-04-21 21:46:12.000000000 +0000 @@ -72,8 +72,6 @@ if ( (chunk_size != 52) || (format_version != 1) || (format_id != 0) || - (channel_type != 2) || - (channel_num != 2) || (block_size_per_channel != 4096) || strncmp( (char *)buffer_ptr(&buf), "\0\0\0\0", 4 ) ) { PerlIO_printf(PerlIO_stderr(), "Invalid DSF file: unsupported fmt header: %s\n", file); Binary files /tmp/tmpm99umr/Yx8ab0svRP/libaudio-scan-perl-0.99/t/dsf/6channel.dsf and /tmp/tmpm99umr/KK2NnI4T7u/libaudio-scan-perl-1.00/t/dsf/6channel.dsf differ diff -Nru libaudio-scan-perl-0.99/t/dsf.t libaudio-scan-perl-1.00/t/dsf.t --- libaudio-scan-perl-0.99/t/dsf.t 2017-11-24 22:57:04.000000000 +0000 +++ libaudio-scan-perl-1.00/t/dsf.t 2018-04-21 22:00:35.000000000 +0000 @@ -2,7 +2,7 @@ use File::Spec::Functions; use FindBin (); -use Test::More tests => 24; +use Test::More tests => 35; use Audio::Scan; @@ -52,6 +52,28 @@ is( $tags->{TSSE}, 'KORG AudioGate ver.2.3.3 (Windows 7)', 'TCON ok' ); } +# 6-channel DSF +{ + my $s = Audio::Scan->scan( _f('6channel.dsf') ); + + my $info = $s->{info}; + my $tags = $s->{tags}; + + is( $info->{audio_offset}, 92, 'Audio offset ok' ); + is( $info->{audio_size}, 567803904, 'Audio size ok' ); + is( $info->{bitrate}, 9, 'Bitrate ok' ); + is( $info->{bits_per_sample}, 1, 'Bits/sample ok' ); + is( $info->{file_size}, 397, 'File size ok' ); + is( $info->{channels}, 6, 'Channels ok' ); + is( $info->{song_length_ms}, 268226, 'Song length ok' ); + is( $info->{samplerate}, 2822400, 'Sample rate ok' ); + is( $info->{block_size_per_channel}, 4096, 'Block align ok' ); + + is( $info->{id3_version}, 'ID3v2.3.0', 'ID3 version ok' ); + + is( $tags->{TALB}, 'Depeche Mode', 'TALB ok' ); +} + sub _f { return catfile( $FindBin::Bin, 'dsf', shift ); }