Skip to content

Commit

Permalink
Merge pull request kairusds-testing#3 from Acivev/tab-indents
Browse files Browse the repository at this point in the history
Tabs to 4 Spaces
  • Loading branch information
kairusds authored Dec 27, 2021
2 parents 309da6c + 2d86ddf commit eb714f8
Show file tree
Hide file tree
Showing 694 changed files with 71,835 additions and 71,835 deletions.
156 changes: 78 additions & 78 deletions AndEngine/src/org/anddev/andengine/audio/BaseAudioEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,82 +8,82 @@
* @since 16:35:37 - 13.06.2010
*/
public abstract class BaseAudioEntity implements IAudioEntity {
// ===========================================================
// Constants
// ===========================================================

// ===========================================================
// Fields
// ===========================================================

private final IAudioManager<? extends IAudioEntity> mAudioManager;

protected float mLeftVolume = 1.0f;
protected float mRightVolume = 1.0f;

// ===========================================================
// Constructors
// ===========================================================

public BaseAudioEntity(final IAudioManager<? extends IAudioEntity> pAudioManager) {
this.mAudioManager = pAudioManager;
}

// ===========================================================
// Getter & Setter
// ===========================================================

protected IAudioManager<? extends IAudioEntity> getAudioManager() {
return this.mAudioManager;
}

public float getActualLeftVolume() {
return this.mLeftVolume * this.getMasterVolume();
}

public float getActualRightVolume() {
return this.mRightVolume * this.getMasterVolume();
}

protected float getMasterVolume() {
return this.mAudioManager.getMasterVolume();
}

// ===========================================================
// Methods for/from SuperClass/Interfaces
// ===========================================================

@Override
public float getVolume() {
return (this.mLeftVolume + this.mRightVolume) * 0.5f;
}

@Override
public float getLeftVolume() {
return this.mLeftVolume;
}

@Override
public float getRightVolume() {
return this.mRightVolume;
}

@Override
public final void setVolume(final float pVolume) {
this.setVolume(pVolume, pVolume);
}

@Override
public void setVolume(final float pLeftVolume, final float pRightVolume) {
this.mLeftVolume = pLeftVolume;
this.mRightVolume = pRightVolume;
}

// ===========================================================
// Methods
// ===========================================================

// ===========================================================
// Inner and Anonymous Classes
// ===========================================================
// ===========================================================
// Constants
// ===========================================================

// ===========================================================
// Fields
// ===========================================================

private final IAudioManager<? extends IAudioEntity> mAudioManager;

protected float mLeftVolume = 1.0f;
protected float mRightVolume = 1.0f;

// ===========================================================
// Constructors
// ===========================================================

public BaseAudioEntity(final IAudioManager<? extends IAudioEntity> pAudioManager) {
this.mAudioManager = pAudioManager;
}

// ===========================================================
// Getter & Setter
// ===========================================================

protected IAudioManager<? extends IAudioEntity> getAudioManager() {
return this.mAudioManager;
}

public float getActualLeftVolume() {
return this.mLeftVolume * this.getMasterVolume();
}

public float getActualRightVolume() {
return this.mRightVolume * this.getMasterVolume();
}

protected float getMasterVolume() {
return this.mAudioManager.getMasterVolume();
}

// ===========================================================
// Methods for/from SuperClass/Interfaces
// ===========================================================

@Override
public float getVolume() {
return (this.mLeftVolume + this.mRightVolume) * 0.5f;
}

@Override
public float getLeftVolume() {
return this.mLeftVolume;
}

@Override
public float getRightVolume() {
return this.mRightVolume;
}

@Override
public final void setVolume(final float pVolume) {
this.setVolume(pVolume, pVolume);
}

@Override
public void setVolume(final float pLeftVolume, final float pRightVolume) {
this.mLeftVolume = pLeftVolume;
this.mRightVolume = pRightVolume;
}

// ===========================================================
// Methods
// ===========================================================

// ===========================================================
// Inner and Anonymous Classes
// ===========================================================
}
128 changes: 64 additions & 64 deletions AndEngine/src/org/anddev/andengine/audio/BaseAudioManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,68 +10,68 @@
* @since 18:07:02 - 13.06.2010
*/
public abstract class BaseAudioManager<T extends IAudioEntity> implements IAudioManager<T> {
// ===========================================================
// Constants
// ===========================================================

// ===========================================================
// Fields
// ===========================================================

protected final ArrayList<T> mAudioEntities = new ArrayList<T>();

protected float mMasterVolume = 1.0f;

// ===========================================================
// Constructors
// ===========================================================

// ===========================================================
// Getter & Setter
// ===========================================================

// ===========================================================
// Methods for/from SuperClass/Interfaces
// ===========================================================

@Override
public float getMasterVolume() {
return this.mMasterVolume;
}

@Override
public void setMasterVolume(final float pMasterVolume) {
this.mMasterVolume = pMasterVolume;

final ArrayList<T> audioEntities = this.mAudioEntities;
for(int i = audioEntities.size() - 1; i >= 0; i--) {
final T audioEntity = audioEntities.get(i);

audioEntity.onMasterVolumeChanged(pMasterVolume);
}
}

@Override
public void add(final T pAudioEntity) {
this.mAudioEntities.add(pAudioEntity);
}

@Override
public void releaseAll() {
final ArrayList<T> audioEntities = this.mAudioEntities;
for(int i = audioEntities.size() - 1; i >= 0; i--) {
final T audioEntity = audioEntities.get(i);

audioEntity.stop();
audioEntity.release();
}
}

// ===========================================================
// Methods
// ===========================================================

// ===========================================================
// Inner and Anonymous Classes
// ===========================================================
// ===========================================================
// Constants
// ===========================================================

// ===========================================================
// Fields
// ===========================================================

protected final ArrayList<T> mAudioEntities = new ArrayList<T>();

protected float mMasterVolume = 1.0f;

// ===========================================================
// Constructors
// ===========================================================

// ===========================================================
// Getter & Setter
// ===========================================================

// ===========================================================
// Methods for/from SuperClass/Interfaces
// ===========================================================

@Override
public float getMasterVolume() {
return this.mMasterVolume;
}

@Override
public void setMasterVolume(final float pMasterVolume) {
this.mMasterVolume = pMasterVolume;

final ArrayList<T> audioEntities = this.mAudioEntities;
for(int i = audioEntities.size() - 1; i >= 0; i--) {
final T audioEntity = audioEntities.get(i);

audioEntity.onMasterVolumeChanged(pMasterVolume);
}
}

@Override
public void add(final T pAudioEntity) {
this.mAudioEntities.add(pAudioEntity);
}

@Override
public void releaseAll() {
final ArrayList<T> audioEntities = this.mAudioEntities;
for(int i = audioEntities.size() - 1; i >= 0; i--) {
final T audioEntity = audioEntities.get(i);

audioEntity.stop();
audioEntity.release();
}
}

// ===========================================================
// Methods
// ===========================================================

// ===========================================================
// Inner and Anonymous Classes
// ===========================================================
}
36 changes: 18 additions & 18 deletions AndEngine/src/org/anddev/andengine/audio/IAudioEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@
* @since 14:53:29 - 13.06.2010
*/
public interface IAudioEntity {
// ===========================================================
// Final Fields
// ===========================================================
// ===========================================================
// Final Fields
// ===========================================================

// ===========================================================
// Methods
// ===========================================================
// ===========================================================
// Methods
// ===========================================================

public void play();
public void pause();
public void resume();
public void stop();
public void play();
public void pause();
public void resume();
public void stop();

public float getVolume();
public void setVolume(final float pVolume);
public float getVolume();
public void setVolume(final float pVolume);

public float getLeftVolume();
public float getRightVolume();
public void setVolume(final float pLeftVolume, final float pRightVolume);
public float getLeftVolume();
public float getRightVolume();
public void setVolume(final float pLeftVolume, final float pRightVolume);

public void onMasterVolumeChanged(final float pMasterVolume);
public void onMasterVolumeChanged(final float pMasterVolume);

public void setLooping(final boolean pLooping);
public void setLooping(final boolean pLooping);

public void release();
public void release();
}
20 changes: 10 additions & 10 deletions AndEngine/src/org/anddev/andengine/audio/IAudioManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
* @since 15:02:06 - 13.06.2010
*/
public interface IAudioManager<T extends IAudioEntity> {
// ===========================================================
// Final Fields
// ===========================================================
// ===========================================================
// Final Fields
// ===========================================================

// ===========================================================
// Methods
// ===========================================================
// ===========================================================
// Methods
// ===========================================================

public float getMasterVolume();
public void setMasterVolume(final float pMasterVolume);
public float getMasterVolume();
public void setMasterVolume(final float pMasterVolume);

public void add(final T pAudioEntity);
public void add(final T pAudioEntity);

public void releaseAll();
public void releaseAll();
}
Loading

0 comments on commit eb714f8

Please sign in to comment.