forked from discord-jda/JDA
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Externalize opus binaries (discord-jda#659)
* Moved opus out into external repository * Added information on how to exclude opus * Add opus-java to dependencies list in README * Add support for using custom opus library paths
- Loading branch information
1 parent
599b414
commit 1af46b4
Showing
17 changed files
with
206 additions
and
620 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 120 additions & 0 deletions
120
src/main/java/net/dv8tion/jda/core/audio/AudioNatives.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| /* | ||
| * Copyright 2015-2018 Austin Keener & Michael Ritter & Florian Spieß | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package net.dv8tion.jda.core.audio; | ||
|
|
||
| import club.minnced.opus.util.OpusLibrary; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * Controller used by JDA to ensure the native | ||
| * binaries for opus en-/decoding are available. | ||
| * | ||
| * @see <a href="https://github.com/discord-java/opus-java" target="_blank">opus-java source</a> | ||
| */ | ||
| public final class AudioNatives | ||
| { | ||
| private static final Logger LOG = LoggerFactory.getLogger(AudioNatives.class); | ||
| private static boolean initialized; | ||
| private static boolean audioSupported; | ||
|
|
||
| private AudioNatives() {} | ||
|
|
||
| /** | ||
| * Whether the opus library is loaded or not. | ||
| * <br>This is initialized by the first call to {@link #ensureOpus()}. | ||
| * | ||
| * @return True, opus library is loaded. | ||
| */ | ||
| public static boolean isAudioSupported() | ||
| { | ||
| return audioSupported; | ||
| } | ||
|
|
||
| /** | ||
| * Whether this class was already initialized or not. | ||
| * | ||
| * @return True, if this class was already initialized. | ||
| * | ||
| * @see #ensureOpus() | ||
| */ | ||
| public static boolean isInitialized() | ||
| { | ||
| return initialized; | ||
| } | ||
|
|
||
| /** | ||
| * Checks whether the opus binary was loaded, if not it will be initialized here. | ||
| * <br>This is used by JDA to check at runtime whether the opus library is available or not. | ||
| * | ||
| * @return True, if the library could be loaded. | ||
| */ | ||
| public static synchronized boolean ensureOpus() | ||
| { | ||
| if (initialized) | ||
| return audioSupported; | ||
| initialized = true; | ||
| try | ||
| { | ||
| if (OpusLibrary.isInitialized()) | ||
| return audioSupported = true; | ||
| audioSupported = OpusLibrary.loadFromJar(); | ||
| } | ||
| catch (Throwable e) | ||
| { | ||
| handleException(e); | ||
| } | ||
| finally | ||
| { | ||
| if (audioSupported) | ||
| LOG.info("Audio System successfully setup!"); | ||
| else | ||
| LOG.info("Audio System encountered problems while loading, thus, is disabled."); | ||
| } | ||
| return audioSupported; | ||
| } | ||
|
|
||
| private static void handleException(Throwable e) | ||
| { | ||
| if (e instanceof UnsupportedOperationException) | ||
| { | ||
| LOG.error("Sorry, JDA's audio system doesn't support this system.\n{}", e.getMessage()); | ||
| } | ||
| else if (e instanceof NoClassDefFoundError) | ||
| { | ||
| LOG.error("Missing opus dependency, unable to initialize audio!"); | ||
| } | ||
| else if (e instanceof IOException) | ||
| { | ||
| LOG.error("There was an IO Exception when setting up the temp files for audio.", e); | ||
| } | ||
| else if (e instanceof UnsatisfiedLinkError) | ||
| { | ||
| LOG.error("JDA encountered a problem when attempting to load the Native libraries. Contact a DEV.", e); | ||
| } | ||
| else if (e instanceof Error) | ||
| { | ||
| throw (Error) e; | ||
| } | ||
| else | ||
| { | ||
| LOG.error("An unknown exception occurred while attempting to setup JDA's audio system!", e); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.