demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Improve media control logging

Browse Source
This commit is contained in:
José Rebelo
2026-02-18 23:09:09 +00:00
parent 433787d3af
commit f60cb524f7
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventMusicControl.java
+1 -7
View File
@@ -22,15 +22,10 @@ import android.content.Intent;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice; import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.service.receivers.GBMusicControlReceiver; import nodomain.freeyourgadget.gadgetbridge.service.receivers.GBMusicControlReceiver;
public class GBDeviceEventMusicControl extends GBDeviceEvent { public class GBDeviceEventMusicControl extends GBDeviceEvent {
private static final Logger LOG = LoggerFactory.getLogger(GBDeviceEventMusicControl.class);
public Event event; public Event event;
public GBDeviceEventMusicControl() { public GBDeviceEventMusicControl() {
@@ -42,8 +37,7 @@ public class GBDeviceEventMusicControl extends GBDeviceEvent {
} }
@Override @Override
public void evaluate(final Context context, final GBDevice device) { public void evaluate(final Context context, @NonNull final GBDevice device) {
LOG.info("Got event for MUSIC_CONTROL");
final Intent musicIntent = new Intent(GBMusicControlReceiver.ACTION_MUSICCONTROL); final Intent musicIntent = new Intent(GBMusicControlReceiver.ACTION_MUSICCONTROL);
musicIntent.putExtra("event", event.ordinal()); musicIntent.putExtra("event", event.ordinal());
musicIntent.setPackage(context.getPackageName()); musicIntent.setPackage(context.getPackageName());
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/receivers/GBMusicControlReceiver.java
+8
View File
@@ -77,10 +77,12 @@ public class GBMusicControlReceiver extends BroadcastReceiver {
keyCode = KeyEvent.KEYCODE_MEDIA_FAST_FORWARD; keyCode = KeyEvent.KEYCODE_MEDIA_FAST_FORWARD;
break; break;
case VOLUMEUP: case VOLUMEUP:
LOG.debug("Adjusting volume up");
audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_RAISE, 0); audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_RAISE, 0);
sendPhoneVolume(audioManager); sendPhoneVolume(audioManager);
return; return;
case VOLUMEDOWN: case VOLUMEDOWN:
LOG.debug("Adjusting volume down");
audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_LOWER, 0); audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_LOWER, 0);
sendPhoneVolume(audioManager); sendPhoneVolume(audioManager);
return; return;
@@ -150,6 +152,8 @@ public class GBMusicControlReceiver extends BroadcastReceiver {
controller = controllers.get(0); controller = controllers.get(0);
} }
LOG.debug("Will send {} to media controller for {}", musicCmd, controller.getPackageName());
switch (musicCmd) { switch (musicCmd) {
case NEXT: case NEXT:
controller.getTransportControls().skipToNext(); controller.getTransportControls().skipToNext();
@@ -166,6 +170,7 @@ public class GBMusicControlReceiver extends BroadcastReceiver {
case PLAYPAUSE: case PLAYPAUSE:
final PlaybackState playbackState = controller.getPlaybackState(); final PlaybackState playbackState = controller.getPlaybackState();
if (playbackState != null) { if (playbackState != null) {
LOG.debug("Current playback state for media controller: {}", playbackState);
switch (playbackState.getState()) { switch (playbackState.getState()) {
case PlaybackState.STATE_NONE: case PlaybackState.STATE_NONE:
case PlaybackState.STATE_STOPPED: case PlaybackState.STATE_STOPPED:
@@ -178,6 +183,7 @@ public class GBMusicControlReceiver extends BroadcastReceiver {
controller.getTransportControls().pause(); controller.getTransportControls().pause();
return; return;
default: default:
LOG.error("Unknown playback state {}", playbackState);
return; return;
} }
} else { } else {
@@ -212,6 +218,8 @@ public class GBMusicControlReceiver extends BroadcastReceiver {
final int volumeMax = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC); final int volumeMax = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
final int volumePercentage = (byte) Math.round(100 * (volumeLevel / (float) volumeMax)); final int volumePercentage = (byte) Math.round(100 * (volumeLevel / (float) volumeMax));
LOG.debug("Sending volume to phone: {}", volumePercentage);
GBApplication.deviceService().onSetPhoneVolume(volumePercentage); GBApplication.deviceService().onSetPhoneVolume(volumePercentage);
} }