Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

23 changes: 0 additions & 23 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/encodings.xml

This file was deleted.

19 changes: 0 additions & 19 deletions .idea/gradle.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/misc.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/modules.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/scopes/scope_settings.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/vcs.xml

This file was deleted.

21 changes: 0 additions & 21 deletions android-sample.iml

This file was deleted.

90 changes: 0 additions & 90 deletions app/app.iml

This file was deleted.

3 changes: 1 addition & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 21
buildToolsVersion "21.1.2"

defaultConfig {
applicationId "com.deezer.sdk.sample"

minSdkVersion 8
minSdkVersion 14
targetSdkVersion 21

versionCode 1
Expand Down
44 changes: 21 additions & 23 deletions app/src/main/java/com/deezer/sdk/sample/EqualizerActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import android.widget.SeekBar.OnSeekBarChangeListener;
import android.widget.Toast;

import com.deezer.sdk.model.PlayableEntity;
import com.deezer.sdk.model.Track;
import com.deezer.sdk.network.connect.SessionStore;
import com.deezer.sdk.network.request.event.DeezerError;
import com.deezer.sdk.network.request.event.OAuthException;
import com.deezer.sdk.player.RadioPlayer;
import com.deezer.sdk.player.RadioPlayer.RadioType;
import com.deezer.sdk.player.event.RadioPlayerListener;
Expand Down Expand Up @@ -107,9 +107,6 @@ private void createPlayer() {
mRadioPlayer.addPlayerListener(this);
setAttachedPlayer(mRadioPlayer);
}
catch (OAuthException e) {
handleError(e);
}
catch (DeezerError e) {
handleError(e);
}
Expand Down Expand Up @@ -152,26 +149,30 @@ public void onStopTrackingTouch(final SeekBar seekBar) {
//////////////////////////////////////////////////////////////////////////////////////
// Radio Player Callbacks
//////////////////////////////////////////////////////////////////////////////////////



@Override
public void onPlayTrack(final Track track) {
displayTrack(track);

public void onAllTracksEnded() {
}

@Override
public void onPlayTrack(PlayableEntity playableEntity) {
if(playableEntity.getType()=="track")
displayTrack((Track)playableEntity);

mEqualizer = new Equalizer(0, mRadioPlayer.getAudioSessionId());
mEqualizer.setEnabled(true);

int numBands = mEqualizer.getNumberOfBands();
Log.i("Equalizer", "Number of bands : " + numBands);

mRange = mEqualizer.getBandLevelRange();
Log.i("Equalizer", "Level range : " + Arrays.toString(mRange) + " milliBels");

for (int i = 0; i < mSeekBars.length; ++i) {

if (i < numBands) {
mSeekBars[i].setVisibility(View.VISIBLE);

int percent = ((mEqualizer.getBandLevel((short) i) - mRange[0]) * MAX_SEEK)
/ (mRange[1] - mRange[0]);
mSeekBars[i].setOnSeekBarChangeListener(null);
Expand All @@ -182,19 +183,16 @@ public void onPlayTrack(final Track track) {
mSeekBars[i].setVisibility(View.GONE);
mSeekBars[i].setOnSeekBarChangeListener(null);
}

}

}
@Override
public void onTrackEnded(final Track track) {
}

@Override
public void onAllTracksEnded() {
public void onTrackEnded(PlayableEntity playableEntity) {

}


@Override
public void onRequestException(final Exception e, final Object requestId) {
handleError(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import android.widget.TextView;
import android.widget.Toast;

import com.deezer.sdk.model.PlayableEntity;
import com.deezer.sdk.model.Track;
import com.deezer.sdk.player.PlayerWrapper;
import com.deezer.sdk.player.PlayerWrapper.RepeatMode;
Expand Down
15 changes: 7 additions & 8 deletions app/src/main/java/com/deezer/sdk/sample/RadiosActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import android.widget.ExpandableListView.OnChildClickListener;
import android.widget.Toast;

import com.deezer.sdk.model.PlayableEntity;
import com.deezer.sdk.model.Radio;
import com.deezer.sdk.model.RadioCategory;
import com.deezer.sdk.model.Track;
Expand All @@ -14,7 +15,6 @@
import com.deezer.sdk.network.request.DeezerRequest;
import com.deezer.sdk.network.request.DeezerRequestFactory;
import com.deezer.sdk.network.request.event.DeezerError;
import com.deezer.sdk.network.request.event.OAuthException;
import com.deezer.sdk.network.request.event.RadioCategoriesRequestListener;
import com.deezer.sdk.player.RadioPlayer;
import com.deezer.sdk.player.RadioPlayer.RadioType;
Expand Down Expand Up @@ -81,8 +81,6 @@ private void createPlayer() {
new WifiAndMobileNetworkStateChecker());
mRadioPlayer.addPlayerListener(this);
setAttachedPlayer(mRadioPlayer);
} catch (OAuthException e) {
handleError(e);
} catch (DeezerError e) {
handleError(e);
} catch (TooManyPlayersExceptions e) {
Expand Down Expand Up @@ -176,18 +174,19 @@ public void onException(final Exception exception,
// Radio Player Callbacks
//////////////////////////////////////////////////////////////////////////////////////


@Override
public void onPlayTrack(final Track track) {
displayTrack(track);
public void onAllTracksEnded() {
}

@Override
public void onTrackEnded(final Track track) {
public void onPlayTrack(PlayableEntity playableEntity) {
if(playableEntity.getType()=="track")
displayTrack((Track)playableEntity);
}

@Override
public void onAllTracksEnded() {
public void onTrackEnded(PlayableEntity playableEntity) {

}


Expand Down
Loading