summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Boot <bootc@debian.org>2019-12-01 21:32:04 +0000
committerChris Boot <bootc@debian.org>2019-12-01 21:32:04 +0000
commitf1d6fddfe1818efeb27b4246445cc422077db3d6 (patch)
treef62a96e1245fa5a73546e1314c447d54b1b18b8b
parent8582d085ad1d65a5127bbc365dd866565680f661 (diff)
d/patches/typo-fixes.patch: remove; included upstream
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/typo-fixes.patch508
3 files changed, 1 insertions, 509 deletions
diff --git a/debian/changelog b/debian/changelog
index 5185f41..21a0d84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
shairport-sync (3.3.5-1) UNRELEASED; urgency=medium
* New upstream release.
+ * d/patches/typo-fixes.patch: remove; included upstream.
-- Chris Boot <bootc@debian.org> Sun, 01 Dec 2019 19:18:09 +0000
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e2748c6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-typo-fixes.patch
diff --git a/debian/patches/typo-fixes.patch b/debian/patches/typo-fixes.patch
deleted file mode 100644
index 80cb07a..0000000
--- a/debian/patches/typo-fixes.patch
+++ /dev/null
@@ -1,508 +0,0 @@
-Description: Correct various typos
-Author: Chris Boot <bootc@debian.org>
-Last-Update: 2019-07-26
-
---- a/INSTALL.md
-+++ b/INSTALL.md
-@@ -2,7 +2,7 @@
- ==
- Here are simple instructions for building and installing Shairport Sync on a Raspberry Pi B, 2B, 3B or 3B+. It is assumed that the Pi is running Raspbian Stretch Lite – a GUI isn't needed, since Shairport Sync runs as a daemon program. For a more thorough treatment, please go to the [README.md](https://github.com/mikebrady/shairport-sync/blob/master/README.md#building-and-installing) page.
-
--In the commands below, note the convention that a `#` prompt means you are in superuser mode and a `$` prompt means you are in a regular non-priviliged user mode. You can use `sudo` *("SUperuser DO")* to temporarily promote yourself from user to superuser, if permitted. For example, if you want to execute `apt-get update` in superuser mode and you are in user mode, enter `sudo apt-get update`.
-+In the commands below, note the convention that a `#` prompt means you are in superuser mode and a `$` prompt means you are in a regular unprivileged user mode. You can use `sudo` *("SUperuser DO")* to temporarily promote yourself from user to superuser, if permitted. For example, if you want to execute `apt-get update` in superuser mode and you are in user mode, enter `sudo apt-get update`.
-
- ### Configure and Update
- Do the usual update and upgrade:
---- a/README.md
-+++ b/README.md
-@@ -97,7 +97,7 @@
-
- **Determine The Configuration Needed**
-
--Shairport Sync has a number of different "backends" that connnect it to the system's audio handling infrastructure. Most recent Linux distributions that have a GUI – including Ubuntu, Debian and others – use PulseAudio to handle sound. In such cases, it is inadvisable to attempt to disable or remove PulseAudio. Thus, if your system uses PulseAudio, you should build Shairport Sync with the PulseAudio backend. You can check to see if PulseAudio is running by opening a Terminal window and entering the command `$ pactl info`. Here is an example of what you'll get if PulseAudio is installed, though the exact details may vary:
-+Shairport Sync has a number of different "backends" that connect it to the system's audio handling infrastructure. Most recent Linux distributions that have a GUI – including Ubuntu, Debian and others – use PulseAudio to handle sound. In such cases, it is inadvisable to attempt to disable or remove PulseAudio. Thus, if your system uses PulseAudio, you should build Shairport Sync with the PulseAudio backend. You can check to see if PulseAudio is running by opening a Terminal window and entering the command `$ pactl info`. Here is an example of what you'll get if PulseAudio is installed, though the exact details may vary:
- ```
- $ pactl info
- Server String: unix:/run/user/1000/pulse/native
-@@ -609,7 +609,7 @@
-
- "Output frames per second" is the actual rate at which frames of audio are taken by the output device. On a system with a well-conditioned `ntp`-based clock (and without output underruns) this figure should be very accurate after playing material continuously for a period.
-
--"Source clock drift in ppm" is an estimate of the difference in timekeeping between the audio source and the Shairport Sync devive. It is calculated from a linear regression of drift sample data. The number of samples the estimate is based on is given in the next column, "Source clock drift sample count".
-+"Source clock drift in ppm" is an estimate of the difference in timekeeping between the audio source and the Shairport Sync device. It is calculated from a linear regression of drift sample data. The number of samples the estimate is based on is given in the next column, "Source clock drift sample count".
-
- "Rough calculated correction in ppm" is a very crude estimate of the amount of interpolation that needs to applied, on average, to keep sync. It is not really to be relied on at this time.
-
---- a/RELEASENOTES.md
-+++ b/RELEASENOTES.md
-@@ -3,7 +3,7 @@
- Please see the [Release Notes for 3.3](https://github.com/mikebrady/shairport-sync/releases/tag/3.3).
-
- **Bug Fixes**
--* Fix a bug that sometimes caused a crash when a service name was specified in the configuration file. The fix was to be more systematic in allocating and deallocating memory for temporary strings. Thanks to [Chris Boot](https://github.com/bootc), [Ari Sovijarvi](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925577#5), [Bernhard Übelacker](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925577#10) and [Jeroen Massar](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925577#17) for the bug report. Fixes [Debian Bug report #925577]( https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925577) and supercedes [Pull Request #879](https://github.com/mikebrady/shairport-sync/pull/879).
-+* Fix a bug that sometimes caused a crash when a service name was specified in the configuration file. The fix was to be more systematic in allocating and deallocating memory for temporary strings. Thanks to [Chris Boot](https://github.com/bootc), [Ari Sovijarvi](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925577#5), [Bernhard Übelacker](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925577#10) and [Jeroen Massar](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925577#17) for the bug report. Fixes [Debian Bug report #925577](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925577) and supersedes [Pull Request #879](https://github.com/mikebrady/shairport-sync/pull/879).
- * Correct some documentation typos – thanks again to [Chris Boot](https://github.com/bootc).
-
- **Enhancements**
-@@ -143,7 +143,7 @@
- Version 3.2RC1
- ====
- **Enhancements**
--* Shairport Sync now offers an IPC interface via D-Bus. It provides an incomplete but functional MPRIS interface and also provides a native Shairport Sync interface. Both provide some metadata and some remote control. The native D-Bus interface permits remote control of the current AirPlay or iTunes client. It includes status information about whether the remote control connection is viable or not, i.e. whether it can still be used to control the client. A remote control connection to the audio client becomes valid when the client starts AirPlaying to Shairport Sync. The connections remains valid until the audio source deselects Shairport Sync for AirPlay, or until the client disappears, or until another client starts AirPlaying to Shairport Sync. After 15 minutes of inactivity, the remote contol connection will be dropped.
-+* Shairport Sync now offers an IPC interface via D-Bus. It provides an incomplete but functional MPRIS interface and also provides a native Shairport Sync interface. Both provide some metadata and some remote control. The native D-Bus interface permits remote control of the current AirPlay or iTunes client. It includes status information about whether the remote control connection is viable or not, i.e. whether it can still be used to control the client. A remote control connection to the audio client becomes valid when the client starts AirPlaying to Shairport Sync. The connections remains valid until the audio source deselects Shairport Sync for AirPlay, or until the client disappears, or until another client starts AirPlaying to Shairport Sync. After 15 minutes of inactivity, the remote control connection will be dropped.
- * OpenBSD compatibility. Shairport Sync now compiles on OpenBSD -- please consult the OpenBSD note for details.
- * A new `general` option `volume_control_profile`, for advanced use only, with two options: `"standard"` which uses the standard volume control profile -- this has a higher transfer profile at low volumes and a lower transfer profile at high volumes -- or `"flat"` which uses a uniform transfer profile to linearly scale the output mixer's dB according to the AirPlay volume.
- * Some DACs have a feature that the lowest permissible "attenuation" value that the built-in hardware mixer can be set to is not an attenuation value at all – it is in fact a command to mute the output completely. Shairport Sync has always checked for this feature, basically in order to ignore it when getting the true range of attenuation values offered by the mixer.
-@@ -167,7 +167,7 @@
- **Other Changes**
- * `clip` and `svip` metadata messages are now only generated for a play connection, not for all connections (e.g. connections that just enquire if the service is present).
- * `pfls` and `prsm` metadata messages are less frequent, especially when a play session starts.
--* Shairport Sync now uses about an extra half megabyte of RAM for compatability with TuneBlade's option to have a very long latency -- up to five seconds.
-+* Shairport Sync now uses about an extra half megabyte of RAM for compatibility with TuneBlade's option to have a very long latency -- up to five seconds.
- * Only ask for missing packets to be resent once, and if any error occurs making the request, stop for 10 seconds.
- * Include the `-pthread` flag -- including the pthread library with `-lpthread` isn't always enough.
- * Add optional timing annotations to debug messages -- see the new settings in the diagnostic stanza of the configuration file.
-@@ -184,7 +184,7 @@
- * Stable 3.1.5 and 3.1.6 skipped to synchronise the shairport-sync.spec file contents with the release.
-
- **Enhancement**
--* The metdata output stream can include a `dapo` message carrying the DACP port number to be used when communicating with the DACP remote control. This might be useful because the port number is actually pretty hard to find and requires the use of asynchronous mdns operations. You must be using the Avahi mdns back end.
-+* The metadata output stream can include a `dapo` message carrying the DACP port number to be used when communicating with the DACP remote control. This might be useful because the port number is actually pretty hard to find and requires the use of asynchronous mdns operations. You must be using the Avahi mdns back end.
-
- Version 3.1.4
- ====
-@@ -216,7 +216,7 @@
- * When you update from a previous version of Shairport Sync, your output device may have been left in a muted state. You should use a command line tool like `alsamixer` or `amixer` to unmute the output device before further use.
-
- **Change of Default**
--* The default value for the `alsa` setting `mute_using_playback_switch` has been changed to `"no"` for compatability with other audio players on the same machine. The reason is that when this setting is set to `"yes"`, the output device will be muted when Shairport Sync releases it. Unfortunately, other audio players using the output device expect it to be unmuted, causing problems. Thanks to [Tim Curtis](https://github.com/moodeaudio) at [Moode Audio](http://moodeaudio.org) and [Peter Pablo](https://github.com/PeterPablo) for clarifying the issue.
-+* The default value for the `alsa` setting `mute_using_playback_switch` has been changed to `"no"` for compatibility with other audio players on the same machine. The reason is that when this setting is set to `"yes"`, the output device will be muted when Shairport Sync releases it. Unfortunately, other audio players using the output device expect it to be unmuted, causing problems. Thanks to [Tim Curtis](https://github.com/moodeaudio) at [Moode Audio](http://moodeaudio.org) and [Peter Pablo](https://github.com/PeterPablo) for clarifying the issue.
-
- **Bug Fixes**
- * Fixed bugs that made Shairport Sync drop out or become unavailable when playing YouTube videos, SoundCloud streams etc. from the Mac. Background: there has been a persistent problem with Shairport Sync becoming unavailable after playing, say, a YouTube clip in a browser on the Mac. Shairport Sync 3.1.2 incorporates a change to how certain AirPlay messages are handled. Introduced in nascent form in 3.1.1, further follow-on changes have improved the handling of player lock and have simplified and improved the handling of unexpected loss of connection. Shairport Sync also now works properly with SoundCloud clips played in a browser on the Mac.
-@@ -243,7 +243,7 @@
-
- **Pesky Changes You Should Know About**
- * The `audio_backend_buffer_desired_length_in_seconds` and `audio_backend_latency_offset_in_seconds` settings have been moved from individual backend stanzas to the `general` stanza. They now have an effect on every type of backend.
--* If you are using a System V (aka `systemv`) installation, please note that the default location for PID file has moved -- it is now stored at `/var/run/shairport-sync/shairport-sync.pid`. This change is needed to improve security a little and to improve compatability across platforms. If you're not doing anything strange, this should make no difference.
-+* If you are using a System V (aka `systemv`) installation, please note that the default location for PID file has moved -- it is now stored at `/var/run/shairport-sync/shairport-sync.pid`. This change is needed to improve security a little and to improve compatibility across platforms. If you're not doing anything strange, this should make no difference.
-
- **Enhancements**
- * Resynchronisation, which happens when the synchronisation is incorrect by more than 50 ms by default, should be a lot less intrusive when it occurs – it should now either insert silence or skip frames, as appropriate.
-@@ -345,7 +345,7 @@
- Note: all Version 3 changes are summarized above.
-
- **Bug Fix**
--* Fix a small and generally silent error in configure.ac so that it only looks for the systemd direcotry if systemd has been chosen. It caused a warning when cross-compiling.
-+* Fix a small and generally silent error in configure.ac so that it only looks for the systemd directory if systemd has been chosen. It caused a warning when cross-compiling.
-
- Version 3.0d19 – Development Version
- ----
-@@ -488,7 +488,7 @@
- * Metadata can now be provided via UDP -- thanks to [faceless2](https://github.com/faceless2).
-
- * Statistics output is more machine readable -- thanks to [Jörg Krause](https://github.com/joerg-krause)
--* The `shairport-sync.spec` file has been updated for compatability with building Debian packages using `checkinstall` -- thanks to [vru1](https://github.com/vru1).
-+* The `shairport-sync.spec` file has been updated for compatibility with building Debian packages using `checkinstall` -- thanks to [vru1](https://github.com/vru1).
-
- Version 2.8.3.11 – Development Version
- ----
-@@ -609,13 +609,13 @@
-
- Version 2.9.2 – Development Version
- ----
--Version 2.9.2 focusses on further bug fixes and stability improvements.
-+Version 2.9.2 focuses on further bug fixes and stability improvements.
- * Enhanced stability: an important bug has been fixed in the handling of missing audio frames – i.e. what happens when a frame of audio is truly missing, after all attempts to fetch it have been unsuccessful. The bug would cause Shairport Sync to do an unnecessary resynchronisation, or, if resync was turned off, to jump out of sync. This is a long-standing bug – thanks to [Jörg Krause](https://github.com/joerg-krause) for identifying it.
- * An extra diagnostic has been added which gives the mean, standard deviation and maximum values for inter-packet reception time on the audio port. It may be useful for exploring line quality.
-
- Version 2.9.1 – Development Version
- ----
--Version 2.9.1 focusses on bug fixes and stability improvements.
-+Version 2.9.1 focuses on bug fixes and stability improvements.
- * Stability improvements are concentrated on what happens when a play sessions ends and is followed immediately by a new session. This happens in iOS 9.2 when you click to the next track or to the previous track. It also happens playing YouTube videos when a Mac's System Audio is routed through AirPlay. Thanks to [Tim Curtis](https://github.com/moodeaudio) for help with these issues.
- * A workaround for an apparent flushing issue in TuneBlade has been included. Thanks to [gibman](https://github.com/gibman) for reporting this issue.
- * A number of bug fixes have been made to `configure.ac` – thanks to [Jörg Krause](https://github.com/joerg-krause).
-@@ -694,7 +694,7 @@
- Version 2.7.4 -- Development Version
- ----
- **Enhancements**
--* Use the correct method for finding the `systemd` unit path, as recomended by debain maintainers and
-+* Use the correct method for finding the `systemd` unit path, as recommended by Debian maintainers and
- http://www.freedesktop.org/software/systemd/man/daemon.html#Installing%20Systemd%20Service%20Files. Thanks to [dantheperson](https://github.com/dantheperson).
- * Rather than hardwire the path `/usr/local/bin` as the path to the shairport-sync executable, the value of `$PREFIX` is now used during configuration. Thanks to [Nick Steel](https://github.com/kingosticks).
- * Add some extra diagnostic messages if the hardware buffer in the DAC is smaller than desired.
-@@ -726,7 +726,7 @@
- Version 2.7 -- Development Version
- ----
- **New Features**
--* Extend the volume range for some DACs. Background: some of the cheaper DACS have a very small volume range (that is, the ratio of the highest to the lowest volume, expressed in decibels, is very small). In some really cheap DACs it's only around 30 dB. That means that the difference betweeen the lowest and highest volume settings isn't large enough. With the new feature, if you set the `general` `volume_range_db` to more than the hardware mixer's range, Shairport Sync will combine the hardware mixer's range with a software attenuator to give the desired range. For example, suppose you want a volume range of 70 dB and the hardware mixer offers only 30 dB, then Shairport Sync will make up the other 40 dB with a software attenuator. One drawback is that, when the volume is being changed, there may be a slight delay (0.15 seconds by default) as the audio, whose volume may have been adjusted in software, propagates through the system. Another slight possible drawback is a slightly heavier load on the processor.
-+* Extend the volume range for some DACs. Background: some of the cheaper DACS have a very small volume range (that is, the ratio of the highest to the lowest volume, expressed in decibels, is very small). In some really cheap DACs it's only around 30 dB. That means that the difference between the lowest and highest volume settings isn't large enough. With the new feature, if you set the `general` `volume_range_db` to more than the hardware mixer's range, Shairport Sync will combine the hardware mixer's range with a software attenuator to give the desired range. For example, suppose you want a volume range of 70 dB and the hardware mixer offers only 30 dB, then Shairport Sync will make up the other 40 dB with a software attenuator. One drawback is that, when the volume is being changed, there may be a slight delay (0.15 seconds by default) as the audio, whose volume may have been adjusted in software, propagates through the system. Another slight possible drawback is a slightly heavier load on the processor.
- * Check for underflow a little better when buffer aliasing occurs on very bad connections...
- * Add extra debug messages to the alsa back end to diagnose strange DACs.
- * Add configuration file for the `libao` back end -- to change the buffer size and the latency offset, same as for stdout.
-@@ -748,7 +748,7 @@
-
- Version 2.4.2
- ----
--This release has important enhancements, bug fixes and documentation updates. It also appears to bring compatiblity with Synology NAS devices.
-+This release has important enhancements, bug fixes and documentation updates. It also appears to bring compatibility with Synology NAS devices.
-
-
- **New Features**
-@@ -767,7 +767,7 @@
- * Volume ratios expressed in decibels are now consistently denominated in voltage decibels rather than power decibels. The rationale is that the levels refer to voltage levels, and power is proportional to the square of voltage.
- Thus a ratio of levels of 65535 to 1 is 96.3 dB rather than the 48.15 dB used before.
- * The latency figure returned to the source as part of the response to an rtsp request packet is 11,025, which may (?) be meant to indicate the minimum latency the device is capable of.
--* An experimental handler for a GET_PARAMETER rtsp request has been added. It does nothing except log the occurence.
-+* An experimental handler for a GET_PARAMETER rtsp request has been added. It does nothing except log the occurrence.
- * The RTSP request dispatcher now logs an event whenever an unrecognised rtsp has been made.
-
-
-@@ -779,8 +779,8 @@
-
- Changes from the previous stable version -- 2.4 -- are summarised here:
- * The USE_CUSTOM_LOCAL_STATE_DIR macro was still being used when it should have been USE_CUSTOM_PID_DIR. This could affect users using a custom location for the PID directory.
-- * A compiler error has been fixed that occured if metadata was enabled and tinysvcmdns was included.
-- * A crash has been fixed that occured if metadata was enabled and a metadata pipename was not specified.
-+ * A compiler error has been fixed that occurred if metadata was enabled and tinysvcmdns was included.
-+ * A crash has been fixed that occurred if metadata was enabled and a metadata pipe name was not specified.
- (Thanks to the contributors who reported bugs.)
-
- **Small Changes**
-@@ -827,7 +827,7 @@
-
-
- **Enhancements**
--* Larger range of interpolation. Shairport Sync was previously constrained not to make interpolations ("corrections") of more than about 1 per 1000 frames. This contraint has been relaxed, and it is now able to make corrections of up to 1 in 352 frames. This might result in a faster and undesirably sudden correction early during a play session, so a number of further changes have been made. The full set of these changes is as follows:
-+* Larger range of interpolation. Shairport Sync was previously constrained not to make interpolations ("corrections") of more than about 1 per 1000 frames. This constraint has been relaxed, and it is now able to make corrections of up to 1 in 352 frames. This might result in a faster and undesirably sudden correction early during a play session, so a number of further changes have been made. The full set of these changes is as follows:
- * No corrections happen for the first five seconds.
- * Corrections of up to about 1 in 1000 for the next 25 seconds.
- * Corrections of up to 1 in 352 thereafter.
-@@ -846,7 +846,7 @@
- * The "pipe" backend used output code that would block if the pipe didn't have a reader. This has been replaced by non-blocking code. Here are some implications:
- * When the pipe is created, Shairport Sync will not block if a reader isn't present.
- * If the pipe doesn't have a reader when Shairport Sync wants to output to it, the output will be discarded.
-- * If a reader disappears while writing is occuring, the write will time out after five seconds.
-+ * If a reader disappears while writing is occurring, the write will time out after five seconds.
- * Shairport Sync will only close the pipe on termination.
-
- Version 2.3.9
-@@ -1001,7 +1001,7 @@
- -----
- * Enhancements:
- * New password option: `--password=SECRET`
-- * New tolerance option: `--tolerance=FRAMES`. Use this option to specify the largest synchronisation error to allow before making corrections. The default is 88 frames, i.e. 2 milliseconds. The default tolerance is fine for streaming over wired ethernet; however, if some of the stream's path is via WiFi, or if the source is a third-party product, it may lead to much overcorrection -- i.e. the difference between "corrections" and "net correction" in the `--statistics` option. Increasing the tolerence may reduce the amount of overcorrection.
-+ * New tolerance option: `--tolerance=FRAMES`. Use this option to specify the largest synchronisation error to allow before making corrections. The default is 88 frames, i.e. 2 milliseconds. The default tolerance is fine for streaming over wired ethernet; however, if some of the stream's path is via WiFi, or if the source is a third-party product, it may lead to much overcorrection -- i.e. the difference between "corrections" and "net correction" in the `--statistics` option. Increasing the tolerance may reduce the amount of overcorrection.
-
- Version 2.1.15
- -----
-@@ -1056,7 +1056,7 @@
-
- * Annoying things you should know about if you're updating from a previous version:
- * Options `--with-openssl`, `--with-polarssl` have been replaced with a new option `--with-ssl=<option>` where `<option>` is either `openssl` or `polarssl`.
-- * Option `--with-localstatedir` has been replaced with `--with-piddir`. This compilation option allows you to specify the directory in which the PID file will be written. The directory must exist and be writable. Supercedes the `--with-localstatedir` and describes the intended functionality a little more accurately.
-+ * Option `--with-localstatedir` has been replaced with `--with-piddir`. This compilation option allows you to specify the directory in which the PID file will be written. The directory must exist and be writable. Supersedes the `--with-localstatedir` and describes the intended functionality a little more accurately.
-
- * Bugfixes
- * A small (?) bug in the flush logic has been corrected. Not causing any known problem.
---- a/TROUBLESHOOTING.md
-+++ b/TROUBLESHOOTING.md
-@@ -188,7 +188,7 @@
- Subdevice #0: subdevice #0
- ````
-
--or look at your exisiting '/etc/asound.conf' file, which may look something like this
-+or look at your existing '/etc/asound.conf' file, which may look something like this
-
- ````
- pcm.!default {
---- a/activity_monitor.c
-+++ b/activity_monitor.c
-@@ -123,7 +123,7 @@
- // execute the going_inactive() function.
- //
- // The reason for all this is that we might want to perform the attached scripts
-- // and wait for them to complete before continuing. If they were perfomed in the
-+ // and wait for them to complete before continuing. If they were performed in the
- // activity monitor thread, then we couldn't wait for them to complete.
-
- // Thus, the only time the thread will execute a going_... function is when a non-zero
---- a/alac.h
-+++ b/alac.h
-@@ -13,7 +13,7 @@
-
- struct alac_file {
- unsigned char *input_buffer;
-- int input_buffer_bitaccumulator; /* used so we can do arbitary
-+ int input_buffer_bitaccumulator; /* used so we can do arbitrary
- bit reads */
-
- int samplesize;
---- a/audio.c
-+++ b/audio.c
-@@ -157,7 +157,7 @@
- }
- }
-
-- /* Get the minumum buffer size for fancy interpolation setting in seconds. */
-+ /* Get the minimum buffer size for fancy interpolation setting in seconds. */
- if (config_lookup_float(config.cfg,
- "general.audio_backend_buffer_interpolation_threshold_in_seconds",
- &dvalue)) {
---- a/audio_alsa.c
-+++ b/audio_alsa.c
-@@ -73,7 +73,7 @@
- static double set_volume;
- static int output_method_signalled = 0; // for reporting whether it's using mmap or not
- int delay_type_notified = -1; // for controlling the reporting of whether the output device can do
-- // precison delays (e.g. alsa->pulsaudio virtual devices can't)
-+ // precision delays (e.g. alsa->pulsaudio virtual devices can't)
- int use_monotonic_clock = 0; // this value will be set when the hardware is initialised
-
- audio_output audio_alsa = {
---- a/audio_jack.c
-+++ b/audio_jack.c
-@@ -229,7 +229,7 @@
- if (jack_activate(client)) {
- die("Could not activate %s JACK client.", config.jack_client_name);
- } else {
-- debug(2, "JACK client %s activated sucessfully.", config.jack_client_name);
-+ debug(2, "JACK client %s activated successfully.", config.jack_client_name);
- }
- if (config.jack_autoconnect_pattern != NULL) {
- inform("config.jack_autoconnect_pattern is %s. If you see the program die after this,"
-@@ -257,7 +257,7 @@
- // success
- break;
- default:
-- warn("JACK error no. %d occured while trying to connect %s to %s.", err,
-+ warn("JACK error no. %d occurred while trying to connect %s to %s.", err,
- full_port_name[i], port_list[i]);
- break;
- }
---- a/audio_sndio.c
-+++ b/audio_sndio.c
-@@ -256,7 +256,7 @@
- pthread_mutex_lock(&sndio_mutex);
- size_t estimated_extra_frames_output = 0;
- if (at_least_one_onmove_cb_seen) { // when output starts, the onmove_cb callback will be made
-- // calculate the difference in time between now and when the last callback occoured,
-+ // calculate the difference in time between now and when the last callback occurred,
- // and use it to estimate the frames that would have been output
- uint64_t time_difference = get_absolute_time_in_fp() - time_of_last_onmove_cb;
- uint64_t frame_difference = time_difference * par.rate;
---- a/common.h
-+++ b/common.h
-@@ -148,7 +148,7 @@
- int volume_max_db;
- int no_sync; // disable synchronisation, even if it's available
- int no_mmap; // disable use of mmap-based output, even if it's available
-- double resyncthreshold; // if it get's out of whack my more than this number of seconds, resync.
-+ double resyncthreshold; // if it gets out of whack my more than this number of seconds, resync.
- // Zero means never
- // resync.
- int allow_session_interruption;
-@@ -194,7 +194,7 @@
- char *configfile;
- char *regtype; // The regtype is the service type followed by the protocol, separated by a dot, by
- // default “_raop._tcp.”.
-- char *interface; // a string containg the interface name, or NULL if nothing specified
-+ char *interface; // a string containing the interface name, or NULL if nothing specified
- int interface_index; // only valid if the interface string is non-NULL
- double audio_backend_buffer_desired_length; // this will be the length in seconds of the
- // audio backend buffer -- the DAC buffer for ALSA
---- a/dbus-service.c
-+++ b/dbus-service.c
-@@ -410,10 +410,10 @@
- __attribute__((unused)) gpointer user_data) {
- gdouble th = shairport_sync_get_loudness_threshold(skeleton);
- if ((th <= 0.0) && (th >= -100.0)) {
-- debug(1, ">> setting loudness threshhold to %f.", th);
-+ debug(1, ">> setting loudness threshold to %f.", th);
- config.loudness_reference_volume_db = th;
- } else {
-- debug(1, ">> invalid loudness threshhold: %f. Ignored.", th);
-+ debug(1, ">> invalid loudness threshold: %f. Ignored.", th);
- shairport_sync_set_loudness_threshold(skeleton, config.loudness_reference_volume_db);
- }
- return TRUE;
---- a/man/shairport-sync.7.xml
-+++ b/man/shairport-sync.7.xml
-@@ -364,7 +364,7 @@
- <option>
- <p><opt>interface=</opt><arg>"name"</arg><opt>;</opt></p>
- <optdesc><p>Use this advanced setting if you want to confine Shairport Sync to the
-- named interface. Leave it commented out to get the default bahaviour.</p></optdesc>
-+ named interface. Leave it commented out to get the default behaviour.</p></optdesc>
- </option>
-
- <option>
---- a/metadata_hub.h
-+++ b/metadata_hub.h
-@@ -106,7 +106,7 @@
- // these functions lock and unlock the read-write mutex on the metadata hub and run the watchers
- // afterwards
- void metadata_hub_modify_prolog(void);
--void metadata_hub_modify_epilog(int modified); // set to true if modifications occured, 0 otherwise
-+void metadata_hub_modify_epilog(int modified); // set to true if modifications occurred, 0 otherwise
-
- // these are for safe reading
- void metadata_hub_read_prolog(void);
---- a/player.c
-+++ b/player.c
-@@ -170,7 +170,7 @@
-
- // used in seq_diff and seq_order
-
--// anything with ORDINATE in it must be proctected by the ab_mutex
-+// anything with ORDINATE in it must be protected by the ab_mutex
- static inline int32_t ORDINATE(seq_t x, seq_t base) {
- int32_t p = x; // int32_t from seq_t, i.e. uint16_t, so okay
- int32_t q = base; // int32_t from seq_t, i.e. uint16_t, so okay
-@@ -1921,7 +1921,7 @@
- while (1) {
- pthread_testcancel(); // allow a pthread_cancel request to take effect.
- abuf_t *inframe = buffer_get_frame(conn); // this has cancellation point(s), but it's not
-- // guaranteed that they'll aways be executed
-+ // guaranteed that they'll always be executed
- if (inframe) {
- inbuf = inframe->data;
- inbuflength = inframe->length;
-@@ -1942,7 +1942,7 @@
- debug(1, "Failed to allocate memory for a silent frame silence buffer.");
- } else {
- // the player may change the contents of the buffer, so it has to be zeroed each time;
-- // might as well malloc and freee it locally
-+ // might as well malloc and free it locally
- conn->previous_random_number = generate_zero_frames(
- silence, conn->max_frames_per_packet * conn->output_sample_ratio,
- config.output_format, conn->enable_dither, conn->previous_random_number);
-@@ -1964,7 +1964,7 @@
- debug(1, "Failed to allocate memory for a flush silence buffer.");
- } else {
- // the player may change the contents of the buffer, so it has to be zeroed each time;
-- // might as well malloc and freee it locally
-+ // might as well malloc and free it locally
- conn->previous_random_number = generate_zero_frames(
- silence, conn->max_frames_per_packet * conn->output_sample_ratio,
- config.output_format, conn->enable_dither, conn->previous_random_number);
---- a/player.h
-+++ b/player.h
-@@ -55,7 +55,7 @@
- // Resend requests will be spaced out evenly in the latency period, subject to a minimum interval of
- // about 0.25 seconds.
- // Each buffer occupies 352*4 bytes plus about, say, 64 bytes of overhead in various places, say
--// rougly 1,500 bytes per buffer.
-+// roughly 1,500 bytes per buffer.
- // Thus, 2048 buffers will occupy about 3 megabytes -- no big deal in a normal machine but maybe a
- // problem in an embedded device.
-
---- a/rtsp.c
-+++ b/rtsp.c
-@@ -1137,7 +1137,7 @@
- // Specifically, it's the "X-Apple-Client-Name" string
- // 'snua' -- A "user agent" -- e.g. "iTunes/12..." -- has opened a play
- // session. Specifically, it's the "User-Agent" string
--// The next two two tokens are to facilitiate remote control of the source.
-+// The next two two tokens are to facilitate remote control of the source.
- // There is some information at http://nto.github.io/AirPlay.html about
- // remote control of the source.
- //
-@@ -1869,7 +1869,7 @@
- unsigned int i;
- for (i = 0; i < sizeof(conn->stream.fmtp) / sizeof(conn->stream.fmtp[0]); i++)
- conn->stream.fmtp[i] = atoi(strsep(&pfmtp, " \t"));
-- // here we should check the sanity ot the fmtp values
-+ // here we should check the sanity of the fmtp values
- // for (i = 0; i < sizeof(conn->stream.fmtp) / sizeof(conn->stream.fmtp[0]); i++)
- // debug(1," fmtp[%2d] is: %10d",i,conn->stream.fmtp[i]);
-
---- a/scripts/shairport-sync.in
-+++ b/scripts/shairport-sync.in
-@@ -47,7 +47,7 @@
- {
- # Return
- # 0 if daemon has been started
-- # 1 if PID directory didn't exist and couldn't be created with approproate permission
-+ # 1 if PID directory didn't exist and couldn't be created with appropriate permission
- # 2 if daemon was already running
- # 3 if daemon could not be started
- [ -e /var/run/shairport-sync ] || ( mkdir -p /var/run/shairport-sync && chown shairport-sync:shairport-sync /var/run/shairport-sync ) || return 1
---- a/shairport-sync.spec
-+++ b/shairport-sync.spec
-@@ -81,12 +81,12 @@
- * Thu Dec 21 2017 Mike Brady <mikebrady@eircom.net> 3.1.7
- - Bug fix for unexpectedly resuming play at full volume from iOS 11.2 and macOS 10.3.2.
- * Mon Dec 11 2017 Mike Brady <mikebrady@eircom.net> 3.1.5
--- Bug fixes and better compatability with iOS 11.2 and mac OS 10.13.2.
-+- Bug fixes and better compatibility with iOS 11.2 and mac OS 10.13.2.
- - Better AirPlay synchronisation.
- * Wed Sep 13 2017 Bill Peck <bpeck@redhat.com> 3.1.2-1
- - New upstream release
- - The default value for the alsa setting mute_using_playback_switch has
-- been changed to "no" for compatability with other audio players on the
-+ been changed to "no" for compatibility with other audio players on the
- same machine. Because of this you may need to unmute your audio device
- if you are upgrading from an older release.
- - Fixed bugs that made Shairport Sync drop out or become unavailable when
---- a/shairport.c
-+++ b/shairport.c
-@@ -1143,7 +1143,7 @@
- /* Check if we are called with -d or --daemon or -j or justDaemoniseNoPIDFile options*/
- if ((daemonisewith != 0) || (daemonisewithout != 0)) {
- fprintf(stderr, "%s was built without libdaemon, so does not support daemonisation using the "
-- "-d, --deamon, -j or --justDaemoniseNoPIDFile options\n",
-+ "-d, --daemon, -j or --justDaemoniseNoPIDFile options\n",
- config.appName);
- exit(EXIT_FAILURE);
- }
-@@ -1494,7 +1494,7 @@
- return 1;
- }
-
-- /* Set indentification string for the daemon for both syslog and PID file */
-+ /* Set identification string for the daemon for both syslog and PID file */
- daemon_pid_file_ident = daemon_log_ident = daemon_ident_from_argv0(argv[0]);
-
- daemon_pid_file_proc = pid_file_proc;
-@@ -1696,7 +1696,7 @@
- debug(1, "statistics_requester status is %d.", config.statistics_requested);
- #if CONFIG_LIBDAEMON
- debug(1, "daemon status is %d.", config.daemonise);
-- debug(1, "deamon pid file path is \"%s\".", pid_file_proc());
-+ debug(1, "daemon pid file path is \"%s\".", pid_file_proc());
- #endif
- debug(1, "rtsp listening port is %d.", config.port);
- debug(1, "udp base port is %d.", config.udp_port_base);
---- a/tinyhttp/chunk.h
-+++ b/tinyhttp/chunk.h
-@@ -33,7 +33,7 @@
-
- /**
- * Parses the size out of a chunk-encoded HTTP response. Returns non-zero if it
-- * needs more data. Retuns zero success or error. When error: size == -1 On
-+ * needs more data. Returns zero success or error. When error: size == -1 On
- * success, size = size of following chunk data excluding trailing \r\n. User is
- * expected to process or otherwise seek past chunk data up to the trailing
- * \r\n. The state parameter is used for internal state and should be
---- a/tinysvcmdns.c
-+++ b/tinysvcmdns.c
-@@ -1576,7 +1576,7 @@
- struct rr_entry *a_e = NULL, *nsec_e = NULL;
-
- // currently can't be called twice
-- // dont ask me what happens if the IP changes
-+ // don't ask me what happens if the IP changes
- assert(svr->hostname == NULL);
-
- a_e = rr_create_a(create_nlabel(hostname), ip); // 120 seconds automatically
-@@ -1596,7 +1596,7 @@
- struct rr_entry *aaaa_e = NULL, *nsec_e = NULL;
-
- // currently can't be called twice
-- // dont ask me what happens if the IP changes
-+ // don't ask me what happens if the IP changes
- assert(svr->hostname == NULL);
-
- aaaa_e = rr_create_aaaa(create_nlabel(hostname), addr); // 120 seconds automatically