Skip to content

Commit

Permalink
Aif Aiff support #475
Browse files Browse the repository at this point in the history
  • Loading branch information
Rello committed Jul 12, 2020
1 parent 3b14f59 commit 0c95d30
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -2,7 +2,7 @@

[![Version](https://img.shields.io/github/release/rello/audioplayer.svg)](https://github.com/rello/audioplayer/blob/master/CHANGELOG.md) [![License: AGPLv3](https://img.shields.io/badge/license-AGPLv3-blue.svg)](http://www.gnu.org/licenses/agpl-3.0)   [![Build Status](https://scrutinizer-ci.com/g/rello/audioplayer/badges/build.png?b=master)](https://scrutinizer-ci.com/g/rello/audioplayer/build-status/master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/rello/audioplayer/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/rello/audioplayer/?branch=master)   [![Bitcoin](https://img.shields.io/badge/donate-Bitcoin-blue.svg)](https://github.com/rello/audioplayer/wiki/donate) [![PayPal](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://github.com/rello/audioplayer/wiki/donate)

A music player for FLAC, MP3, MP4, streams, … with playlist support and SONOS integration.
A music player for FLAC, MP3, MP4, AIF, streams, … with playlist support and SONOS integration.

<img src="https://raw.githubusercontent.com/rello/audioplayer/master/screenshots/audioplayer_screen.png" alt="Main" width="350" height="261" title="Main view with navigation, settings, and sidebar.">

Expand All @@ -19,7 +19,7 @@ A music player for FLAC, MP3, MP4, streams, … with playlist support and SONOS
- [ID3 editor](https://github.com/rello/audioplayer_editor) via add-on

### Supported Formats
FLAC, MP3, MP4, Ogg Vorbis, Opus, and Waveform Audio as well as M3U and PLS playlist files. Playing the formats supported by Audio Player depends on the browser. [More information…](https://github.com/rello/audioplayer/wiki/audio-files-and-mime-types)
FLAC, MP3, MP4, Ogg Vorbis, Opus, AIF, and Waveform Audio as well as M3U and PLS playlist files. Playing the formats supported by Audio Player depends on the browser. [More information…](https://github.com/rello/audioplayer/wiki/audio-files-and-mime-types)

### Supported Browsers
Latest versions of Google Chrome, Mozilla Firefox, and Apple Safari. Mobile browsers and Microsoft Edge may be restricted in functionality and handling. Microsoft Internet Explorer is not supported.
Expand Down
9 changes: 2 additions & 7 deletions appinfo/info.xml
Expand Up @@ -3,7 +3,7 @@
<id>audioplayer</id>
<name>Audio Player</name>
<summary>play / stream / organize</summary>
<description><![CDATA[A music player for FLAC, MP3, MP4, streams, … with playlist support and SONOS integration.
<description><![CDATA[A music player for FLAC, MP3, MP4, AIF, streams, … with playlist support and SONOS integration.
- Cover & List view for all categories
- tuned for big audio collections
Expand All @@ -17,7 +17,7 @@
- [ID3 editor](https://github.com/rello/audioplayer_editor) via add-on
See [README](https://github.com/rello/audioplayer/blob/master/README.md) file for all supported MIME types and additional information.]]></description>
<version>2.11.0</version>
<version>2.10.2</version>
<licence>agpl</licence>
<author>Marcel Scherello</author>
<namespace>audioplayer</namespace>
Expand All @@ -40,11 +40,6 @@ See [README](https://github.com/rello/audioplayer/blob/master/README.md) file fo
<nextcloud min-version="17" max-version="19"/>
<owncloud min-version="9" max-version="10"/>
</dependencies>
<repair-steps>
<post-migration>
<step>OCA\audioplayer\Migration\Migration</step>
</post-migration>
</repair-steps>
<settings>
<admin-section>OCA\audioplayer\Settings\AdminSection</admin-section>
<personal>OCA\audioplayer\Settings\Personal</personal>
Expand Down
2 changes: 1 addition & 1 deletion js/sharing/sharing.js
Expand Up @@ -14,7 +14,7 @@

document.addEventListener('DOMContentLoaded', function () {
//if ($('#header').hasClass('share-file')) {
var mime_array = ['audio/mpeg', 'audio/mp4', 'audio/m4b', 'audio/ogg', 'audio/wav', 'audio/flac'];
var mime_array = ['audio/mpeg', 'audio/mp4', 'audio/m4b', 'audio/ogg', 'audio/wav', 'audio/flac', 'audio/x-aiff'];
var mimeType = $('#mimetype').val();
var sharingToken = $('#sharingToken');

Expand Down
7 changes: 6 additions & 1 deletion js/soundmanager2.js
Expand Up @@ -191,7 +191,12 @@ function SoundManager(smURL, smID) {
'flac': {
'type': ['audio/flac'],
'required': false
}
},

'aif': {
'type': ['audio/x-aiff'],
'required': false
}

};

Expand Down
2 changes: 1 addition & 1 deletion js/viewer/viewer.js
Expand Up @@ -62,7 +62,7 @@ function playFile(file, data) {
}

function registerFileActions() {
var mime_array = ['audio/mpeg', 'audio/mp4', 'audio/m4b', 'audio/ogg', 'audio/wav', 'audio/flac'];
var mime_array = ['audio/mpeg', 'audio/mp4', 'audio/m4b', 'audio/ogg', 'audio/wav', 'audio/flac', 'audio/x-aiff'];
//var stream_array = ['audio/mpegurl', 'audio/x-scpls', 'application/xspf+xml'];
//mime_array = mime_array.concat(stream_array);

Expand Down
3 changes: 2 additions & 1 deletion lib/Controller/ScannerController.php
Expand Up @@ -473,7 +473,8 @@ private function getAudioObjects(OutputInterface $output = null)
$audios_ogg = $userView->searchByMime('audio/ogg');
$audios_wav = $userView->searchByMime('audio/wav');
$audios_flac = $userView->searchByMime('audio/flac');
$audios = array_merge($audios_mp3, $audios_m4a, $audios_ogg, $audios_wav, $audios_flac);
$audios_aif = $userView->searchByMime('audio/x-aiff');
$audios = array_merge($audios_mp3, $audios_m4a, $audios_ogg, $audios_wav, $audios_flac, $audios_aif);

$output->writeln("Scanned Folder: " . $userView->getPath(), OutputInterface::VERBOSITY_VERBOSE);
$output->writeln("<info>Total audio files:</info> " . count($audios), OutputInterface::VERBOSITY_VERBOSE);
Expand Down

0 comments on commit 0c95d30

Please sign in to comment.