Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove audio mute features #322

Merged
merged 1 commit into from
Feb 9, 2020
Merged

Remove audio mute features #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions app/src/main/java/org/jellyfin/androidtv/TvApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.jellyfin.androidtv.playback.PlaybackManager;
import org.jellyfin.androidtv.playback.PlaybackOverlayActivity;
import org.jellyfin.androidtv.search.SearchActivity;
import org.jellyfin.androidtv.util.DeviceUtils;
import org.jellyfin.androidtv.util.Utils;
import org.jellyfin.apiclient.interaction.ApiClient;
import org.jellyfin.apiclient.interaction.EmptyResponse;
Expand Down Expand Up @@ -110,7 +109,6 @@ public class TvApp extends Application {

private GradientDrawable currentBackgroundGradient;

private boolean audioMuted;
private boolean playingIntros;
private DisplayPriorityType displayPriority = DisplayPriorityType.Movies;

Expand Down Expand Up @@ -205,19 +203,6 @@ public void setLoginApiClient(ApiClient loginApiClient) {
this.loginApiClient = loginApiClient;
}

public void setAudioMuted(boolean value) {
audioMuted = value;
getLogger().Info("Setting mute state to: %b", audioMuted);
if (DeviceUtils.is60()) {
audioManager.adjustVolume(audioMuted ? AudioManager.ADJUST_MUTE : AudioManager.ADJUST_UNMUTE, 0);

} else {
audioManager.setStreamMute(AudioManager.STREAM_MUSIC, audioMuted);
}
}

public boolean isAudioMuted() { return audioMuted; }

public PlaybackController getPlaybackController() {
return playbackController;
}
Expand Down
24 changes: 3 additions & 21 deletions app/src/main/java/org/jellyfin/androidtv/eventhandling/TvApiEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
import org.jellyfin.androidtv.querying.StdItemQuery;
import org.jellyfin.androidtv.util.Utils;
import org.jellyfin.androidtv.util.apiclient.PlaybackHelper;

import java.util.Arrays;
import java.util.Calendar;

import org.jellyfin.apiclient.interaction.ApiClient;
import org.jellyfin.apiclient.interaction.ApiEventListener;
import org.jellyfin.apiclient.interaction.Response;
Expand All @@ -23,11 +19,13 @@
import org.jellyfin.apiclient.model.querying.ItemFields;
import org.jellyfin.apiclient.model.querying.ItemsResult;
import org.jellyfin.apiclient.model.session.BrowseRequest;
import org.jellyfin.apiclient.model.session.GeneralCommand;
import org.jellyfin.apiclient.model.session.PlayRequest;
import org.jellyfin.apiclient.model.session.PlaystateRequest;
import org.jellyfin.apiclient.model.session.SessionInfoDto;

import java.util.Arrays;
import java.util.Calendar;

/**
* Created by Eric on 2/14/2015.
*/
Expand Down Expand Up @@ -58,22 +56,6 @@ public void onLibraryChanged(ApiClient client, LibraryUpdateInfo info) {
if (info.getItemsAdded().size() > 0 || info.getItemsRemoved().size() > 0) TvApp.getApplication().setLastLibraryChange(Calendar.getInstance());
}

@Override
public void onGeneralCommand(ApiClient client, GeneralCommand command) {
TvApp.getApplication().getLogger().Info("General command is: %s", command.getName());
switch (command.getName().toLowerCase()) {
case "mute":
TvApp.getApplication().setAudioMuted(true);
break;
case "unmute":
TvApp.getApplication().setAudioMuted(false);
break;
case "togglemute":
TvApp.getApplication().setAudioMuted(!TvApp.getApplication().isAudioMuted());
break;
}
}

@Override
public void onPlaystateCommand(ApiClient client, PlaystateRequest command) {
switch (command.getCommand()) {
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/java/org/jellyfin/androidtv/playback/PlaybackController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,10 +839,6 @@ public void stop() {
// update the actual items resume point
getCurrentlyPlayingItem().getUserData().setPlaybackPositionTicks(mbPos);
}

// be sure to unmute audio in case it was muted
TvApp.getApplication().setAudioMuted(false);

}
}

Expand Down
7 changes: 0 additions & 7 deletions app/src/main/java/org/jellyfin/androidtv/playback/PlaybackOverlayActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,6 @@ public void onCreate(Bundle savedInstanceState) {
loadViews();
}

@Override
protected void onPause() {
super.onPause();
// be sure to unmute audio in case it was muted
TvApp.getApplication().setAudioMuted(false);
}

@Override
public void onDestroy() {
super.onDestroy();
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/java/org/jellyfin/androidtv/startup/StartupActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,6 @@ private void establishConnection(final Activity activity){
playableTypes.add("Audio");
ArrayList<String> supportedCommands = new ArrayList<>();
supportedCommands.add(GeneralCommandType.DisplayContent.toString());
supportedCommands.add(GeneralCommandType.Mute.toString());
supportedCommands.add(GeneralCommandType.Unmute.toString());
supportedCommands.add(GeneralCommandType.ToggleMute.toString());

capabilities.setPlayableMediaTypes(playableTypes);
capabilities.setSupportsContentUploading(false);
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/org/jellyfin/androidtv/util/apiclient/ReportingHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@

import org.jellyfin.androidtv.TvApp;
import org.jellyfin.androidtv.model.compat.StreamInfo;

import java.util.Calendar;

import org.jellyfin.apiclient.interaction.ApiClient;
import org.jellyfin.apiclient.interaction.EmptyResponse;
import org.jellyfin.apiclient.model.dto.BaseItemDto;
import org.jellyfin.apiclient.model.session.PlaybackProgressInfo;
import org.jellyfin.apiclient.model.session.PlaybackStartInfo;
import org.jellyfin.apiclient.model.session.PlaybackStopInfo;

import java.util.Calendar;

public class ReportingHelper {
public static void reportStopped(BaseItemDto item, StreamInfo streamInfo, long pos) {
if (item != null && streamInfo != null) {
Expand Down Expand Up @@ -49,7 +48,6 @@ public static void reportProgress(BaseItemDto item, StreamInfo currentStreamInfo
info.setPositionTicks(position);
info.setIsPaused(isPaused);
info.setCanSeek(currentStreamInfo.getRunTimeTicks() != null && currentStreamInfo.getRunTimeTicks() > 0);
info.setIsMuted(TvApp.getApplication().isAudioMuted());
info.setPlayMethod(currentStreamInfo.getPlayMethod());
if (TvApp.getApplication().getPlaybackController() != null && TvApp.getApplication().getPlaybackController().isPlaying()) {
info.setAudioStreamIndex(TvApp.getApplication().getPlaybackController().getAudioStreamIndex());
Expand Down