Skip to content

Commit 9b29d62

Browse files
zvezdochiotzvezdochiot
committed
19.3.21.35: update
1 parent 7faf168 commit 9b29d62

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+172
-57
lines changed

‎Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,7 @@ clean:
8080
install: sacd
8181

8282
install -d $(DESTDIR)/usr/bin
83-
install ./sacd $(DESTDIR)/usr/bin
83+
install -m 0755 ./sacd $(DESTDIR)/usr/bin
84+
install -d $(DESTDIR)/usr/share/man/man1
85+
install -m 0644 ./sacd.1 $(DESTDIR)/usr/share/man/man1
8486

‎debian/bzr-builder.manifest

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# bzr-builder format 0.3 deb-version {debupstream}.35
2+
lp:sacd revid:[email protected]

‎debian/changelog

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
sacd (19.3.21.35~ubuntu19.04.1) disco; urgency=low
2+
3+
* Auto build.
4+
5+
-- Robert Tari <[email protected]> Thu, 21 Mar 2019 20:43:45 +0000
6+
7+
sacd (19.3.21) xenial; urgency=medium
8+
9+
* Added option to display source info (LP: #1820971)
10+
* Set 88.2KHz as default
11+
12+
-- Robert Tari <[email protected]> Thu, 21 Mar 2019 21:23:48 +0100
13+
114
sacd (18.6.25) xenial; urgency=medium
215

316
* Added option to extract stereo area only

‎debian/control

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Source: sacd
22
Section: sound
33
Priority: optional
4-
Maintainer: Robert Tari <robert[email protected]>
5-
Build-Depends: debhelper (>= 10), g++-4.8
4+
Maintainer: Robert Tari <robert@tari.in>
5+
Build-Depends: debhelper (>= 10), g++
66
Standards-Version: 4.0.1
77
Homepage: https://tari.in/www/software/sacd/
88

‎debian/copyright

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
22
Upstream-Name: sacd
3-
Upstream-Contact: Robert Tari <robert[email protected]>
3+
Upstream-Contact: Robert Tari <robert@tari.in>
44
Source: https://code.launchpad.net/~robert-tari/sacd/trunk
55

66
Files: *
7-
Copyright: 2015-2018 Robert Tari <robert[email protected]>
7+
Copyright: 2015-2019 Robert Tari <robert@tari.in>
88
2012 Vladislav Goncharov <[email protected]>
99
2011-2018 Maxim V.Anisiutkin <[email protected]>
1010
License: GPL-3.0+
1111

1212
Files: debian/*
13-
Copyright: 2018 Robert Tari <robert[email protected]>
13+
Copyright: 2019 Robert Tari <robert@tari.in>
1414
License: GPL-3.0+
1515

1616
License: GPL-3.0+

‎debian/source/format

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0 (quilt)
1+
3.0 (native)

‎debian/watch

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
version=3
2+
http://launchpad.net/sacd/+download .*/sacd-([0-9.]+)\.tar\.gz

‎libdsd2pcm/dither.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
HQ DSD->PCM converter 88.2/96 kHz
3-
Copyright (c) 2015-2016 Robert Tari <robert[email protected]>
3+
Copyright (c) 2015-2016 Robert Tari <robert@tari.in>
44
Copyright (c) 2012 Vladislav Goncharov <[email protected]>
55
66
This file is part of SACD.

‎libdsd2pcm/dsd_pcm_constants.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright (c) 2015-2016 Robert Tari <robert@tari.in>
33
Copyright (c) 2011-2015 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.

‎libdsd2pcm/dsd_pcm_converter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright (c) 2015-2016 Robert Tari <robert@tari.in>
33
Copyright (c) 2011-2015 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.

‎libdsd2pcm/dsd_pcm_converter_engine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright (c) 2015-2016 Robert Tari <robert@tari.in>
33
Copyright (c) 2011-2015 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.

‎libdsd2pcm/dsd_pcm_converter_engine.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright (c) 2015-2016 Robert Tari <robert@tari.in>
33
Copyright (c) 2011-2015 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.

‎libdsd2pcm/dsd_pcm_converter_hq.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright 2015-2016 Robert Tari <robert@tari.in>
33
Copyright 2012 Vladislav Goncharov <[email protected]> (HQ DSD->PCM converter 88.2/96 kHz)
44
55
This file is part of SACD.

‎libdsd2pcm/dsd_pcm_converter_hq.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright 2015-2016 Robert Tari <robert@tari.in>
33
Copyright 2012 Vladislav Goncharov <[email protected]> (HQ DSD->PCM converter 88.2/96 kHz)
44
55
This file is part of SACD.

‎libdsd2pcm/dsd_pcm_converter_multistage.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright (c) 2015-2016 Robert Tari <robert@tari.in>
33
Copyright (c) 2011-2015 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.

‎libdsd2pcm/dsd_pcm_filter_setup.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright (c) 2015-2016 Robert Tari <robert@tari.in>
33
Copyright (c) 2011-2015 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.

‎libdsd2pcm/dsd_pcm_fir.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright (c) 2015-2016 Robert Tari <robert@tari.in>
33
Copyright (c) 2011-2015 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.

‎libdsd2pcm/dsd_pcm_util.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright (c) 2015-2016 Robert Tari <robert@tari.in>
33
Copyright (c) 2011-2015 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.
@@ -26,7 +26,6 @@
2626
#include <malloc.h>
2727
#endif
2828

29-
3029
class DSDPCMUtil
3130
{
3231

‎libdsd2pcm/pcm_pcm_fir.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright (c) 2015-2016 Robert Tari <robert@tari.in>
33
Copyright (c) 2011-2015 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.

‎libdsd2pcm/upsampler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright 2015-2016 Robert Tari <robert@tari.in>
33
Copyright 2012 Vladislav Goncharov <[email protected]>
44
55
This file is part of SACD.

‎libdsd2pcm/upsampler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright 2015-2016 Robert Tari <robert@tari.in>
33
Copyright 2012 Vladislav Goncharov <[email protected]>
44
55
This file is part of SACD.

‎libdstdec/ac_data.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<[email protected]>
2727
2828
* Robert Tari
29-
<robert[email protected]>
29+
<robert@tari.in>
3030
3131
in the course of development of the MPEG-4 Audio standard ISO-14496-1, 2 and 3.
3232
This software module is an implementation of a part of one or more MPEG-4 Audio

‎libdstdec/ac_data.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<[email protected]>
2727
2828
* Robert Tari
29-
<robert[email protected]>
29+
<robert@tari.in>
3030
3131
in the course of development of the MPEG-4 Audio standard ISO-14496-1, 2 and 3.
3232
This software module is an implementation of a part of one or more MPEG-4 Audio

‎libdstdec/coded_table.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<[email protected]>
2727
2828
* Robert Tari
29-
<robert[email protected]>
29+
<robert@tari.in>
3030
3131
in the course of development of the MPEG-4 Audio standard ISO-14496-1, 2 and 3.
3232
This software module is an implementation of a part of one or more MPEG-4 Audio

‎libdstdec/coded_table.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<[email protected]>
2727
2828
* Robert Tari
29-
<robert[email protected]>
29+
<robert@tari.in>
3030
3131
in the course of development of the MPEG-4 Audio standard ISO-14496-1, 2 and 3.
3232
This software module is an implementation of a part of one or more MPEG-4 Audio

‎libdstdec/dst_consts.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<[email protected]>
2828
2929
* Robert Tari
30-
<robert[email protected]>
30+
<robert@tari.in>
3131
3232
in the course of development of the MPEG-4 Audio standard ISO-14496-1, 2 and 3.
3333
This software module is an implementation of a part of one or more MPEG-4 Audio

‎libdstdec/dst_decoder.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<[email protected]>
2828
2929
* Robert Tari
30-
<robert[email protected]>
30+
<robert@tari.in>
3131
3232
in the course of development of the MPEG-4 Audio standard ISO-14496-1, 2 and 3.
3333
This software module is an implementation of a part of one or more MPEG-4 Audio

‎libdstdec/dst_decoder.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<[email protected]>
2828
2929
* Robert Tari
30-
<robert[email protected]>
30+
<robert@tari.in>
3131
3232
in the course of development of the MPEG-4 Audio standard ISO-14496-1, 2 and 3.
3333
This software module is an implementation of a part of one or more MPEG-4 Audio

‎libdstdec/dst_decoder_mt.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright 2015-2016 Robert Tari <robert@tari.in>
33
Copyright 2011-2015 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.

‎libdstdec/dst_decoder_mt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2015 Robert Tari <robert[email protected]>
2+
Copyright 2015 Robert Tari <robert@tari.in>
33
Copyright 2011-2014 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.

‎libdstdec/dst_defs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<[email protected]>
2727
2828
* Robert Tari
29-
<robert[email protected]>
29+
<robert@tari.in>
3030
3131
in the course of development of the MPEG-4 Audio standard ISO-14496-1, 2 and 3.
3232
This software module is an implementation of a part of one or more MPEG-4 Audio

‎libdstdec/frame_reader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<[email protected]>
2727
2828
* Robert Tari
29-
<robert[email protected]>
29+
<robert@tari.in>
3030
3131
in the course of development of the MPEG-4 Audio standard ISO-14496-1, 2 and 3.
3232
This software module is an implementation of a part of one or more MPEG-4 Audio

‎libdstdec/frame_reader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<[email protected]>
2727
2828
* Robert Tari
29-
<robert[email protected]>
29+
<robert@tari.in>
3030
3131
in the course of development of the MPEG-4 Audio standard ISO-14496-1, 2 and 3.
3232
This software module is an implementation of a part of one or more MPEG-4 Audio

‎libdstdec/str_data.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<[email protected]>
2727
2828
* Robert Tari
29-
<robert[email protected]>
29+
<robert@tari.in>
3030
3131
in the course of development of the MPEG-4 Audio standard ISO-14496-1, 2 and 3.
3232
This software module is an implementation of a part of one or more MPEG-4 Audio

‎libdstdec/str_data.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<[email protected]>
2727
2828
* Robert Tari
29-
<robert[email protected]>
29+
<robert@tari.in>
3030
3131
in the course of development of the MPEG-4 Audio standard ISO-14496-1, 2 and 3.
3232
This software module is an implementation of a part of one or more MPEG-4 Audio

‎libsacd/sacd_disc.cpp

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright 2015-2019 Robert Tari <robert@tari.in>
33
Copyright 2011-2016 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.
@@ -335,6 +335,17 @@ bool sacd_disc_t::close()
335335
return true;
336336
}
337337

338+
void sacd_disc_t::getTrackDetails(uint32_t track_number, area_id_e area_id, TrackDetails* cTrackDetails)
339+
{
340+
scarletbook_area_t* cArea = get_area(area_id);
341+
area_track_text_t cAreaTrackText = cArea->area_track_text[track_number];
342+
343+
cTrackDetails->strArtist = cAreaTrackText.track_type_performer.size() ? cAreaTrackText.track_type_performer : "Unknown Artist";
344+
cTrackDetails->strTitle = cAreaTrackText.track_type_title;
345+
cTrackDetails->nChannels = cArea->area_toc->channel_count;
346+
cTrackDetails->nSampleRate = SACD_SAMPLING_FREQUENCY;
347+
}
348+
338349
string sacd_disc_t::set_track(uint32_t track_number, area_id_e area_id, uint32_t offset)
339350
{
340351
if (track_number < get_track_count(area_id))

‎libsacd/sacd_disc.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright 2015-2019 Robert Tari <robert@tari.in>
33
Copyright 2011-2016 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.
@@ -73,6 +73,7 @@ class sacd_disc_t : public sacd_reader_t
7373
string set_track(uint32_t track_number, area_id_e area_id = AREA_BOTH, uint32_t offset = 0);
7474
bool read_frame(uint8_t* frame_data, size_t* frame_size, frame_type_e* frame_type);
7575
bool read_blocks_raw(uint32_t lb_start, size_t block_count, uint8_t* data);
76+
void getTrackDetails(uint32_t track_number, area_id_e area_id, TrackDetails* cTrackDetails);
7677
private:
7778
bool read_master_toc();
7879
bool read_area_toc(int area_idx);

‎libsacd/sacd_dsd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright 2015-2016 Robert Tari <robert@tari.in>
33
Copyright 2011-2012 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.

‎libsacd/sacd_dsdiff.cpp

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2015-2018 Robert Tari <robert[email protected]>
2+
Copyright 2015-2019 Robert Tari <robert@tari.in>
33
Copyright 2011-2018 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.
@@ -395,6 +395,14 @@ bool sacd_dsdiff_t::close()
395395
return true;
396396
}
397397

398+
void sacd_dsdiff_t::getTrackDetails(uint32_t track_number, area_id_e area_id, TrackDetails* cTrackDetails)
399+
{
400+
cTrackDetails->strArtist = "Unknown Artist";
401+
cTrackDetails->strTitle = "Unknown Title";
402+
cTrackDetails->nChannels = m_channel_count;
403+
cTrackDetails->nSampleRate = m_samplerate;
404+
}
405+
398406
string sacd_dsdiff_t::set_track(uint32_t track_number, area_id_e area_id, uint32_t offset)
399407
{
400408
if (track_number < m_subsong.size())

‎libsacd/sacd_dsdiff.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2015-2016 Robert Tari <robert[email protected]>
2+
Copyright 2015-2019 Robert Tari <robert@tari.in>
33
Copyright 2011-2016 Maxim V.Anisiutkin <[email protected]>
44
55
This file is part of SACD.
@@ -111,6 +111,7 @@ class sacd_dsdiff_t : public sacd_reader_t
111111
bool close();
112112
string set_track(uint32_t track_number, area_id_e area_id = AREA_BOTH, uint32_t offset = 0);
113113
bool read_frame(uint8_t* frame_data, size_t* frame_size, frame_type_e* frame_type);
114+
void getTrackDetails(uint32_t track_number, area_id_e area_id, TrackDetails* cTrackDetails);
114115
private:
115116
uint64_t get_dsti_for_frame(uint32_t frame_nr);
116117
};

0 commit comments

Comments
 (0)