ydeng/rhythmbullet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

completed music panes

Browse Source
This commit is contained in:
Harrison Deng 2017-04-21 10:25:24 -05:00
parent 8e205891f1
commit f1fb1adf47
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/assets/uiskin.atlas
View File

@ -275,8 +275,8 @@ right-double-arrow
holo-pane holo-pane
rotate: false rotate: false
xy: 68, 8 xy: 68, 8
size: 3, 3 size: 20, 20
split: 10, 10, 10, 10 split: 9, 9, 9, 9
orig: 20, 20 orig: 20, 20
offset: 0, 0 offset: 0, 0
index: -1 index: -1
@ -284,7 +284,7 @@ holo-pane-down
rotate: false rotate: false
xy: 133, 8 xy: 133, 8
size: 20, 20 size: 20, 20
split: 10, 10, 10, 10 split: 9, 9, 9, 9
orig: 20, 20 orig: 20, 20
offset: 0, 0 offset: 0, 0
index: -1 index: -1

BIN
android/assets/uiskin.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

1
core/src/zero1hd/polyjet/screens/PreGameScreen.java
View File

@ -51,6 +51,7 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter {
//draw music selector //draw music selector
MusicSelectionPage musicSelection = new MusicSelectionPage(core, mainMenu); MusicSelectionPage musicSelection = new MusicSelectionPage(core, mainMenu);
stage.addActor(musicSelection); stage.addActor(musicSelection);
musicSelection.beginMusicSearch();
statusText = new Label(null, core.defaultSkin); statusText = new Label(null, core.defaultSkin);
statusText.setPosition(1.6f*Gdx.graphics.getWidth(), (Gdx.graphics.getHeight()-statusText.getHeight())/2); statusText.setPosition(1.6f*Gdx.graphics.getWidth(), (Gdx.graphics.getHeight()-statusText.getHeight())/2);

3
core/src/zero1hd/polyjet/ui/builders/MusicSelectable.java
View File

@ -44,10 +44,9 @@ public class MusicSelectable extends Button {
songName = id3v2tag.getTitle(); songName = id3v2tag.getTitle();
} }
} catch (UnsupportedTagException | InvalidDataException | IOException e) { } catch (UnsupportedTagException | InvalidDataException | IOException e) {
e.printStackTrace(); Gdx.app.debug("Music Selector", "Error while reading tag for " + musicFile.name());
} }
setSize(0.2f*Gdx.graphics.getWidth(), 0.8f*Gdx.graphics.getHeight());
} else { } else {
wavinfo = new WavInfo(musicFile.file()); wavinfo = new WavInfo(musicFile.file());
durationInSeconds = wavinfo.getDurationInSeconds(); durationInSeconds = wavinfo.getDurationInSeconds();

8
core/src/zero1hd/polyjet/ui/pages/MusicSelectionPage.java
View File

@ -49,8 +49,9 @@ public class MusicSelectionPage extends Page {
addActor(loading); addActor(loading);
musicChoices = new Table(); musicChoices = new Table();
musicChoices.defaults().pad(10f);
ScrollPane musicChoiceScroller = new ScrollPane(musicChoices); ScrollPane musicChoiceScroller = new ScrollPane(musicChoices);
musicChoiceScroller.setSize(getHeight(), getWidth()); musicChoiceScroller.setSize(getWidth(), getHeight()*0.85f);
addActor(musicChoiceScroller); addActor(musicChoiceScroller);
} }
@ -80,7 +81,7 @@ public class MusicSelectionPage extends Page {
this.skin = skin; this.skin = skin;
this.musicDir = musicDir; this.musicDir = musicDir;
System.out.println(musicDir.exists()); // System.out.println(musicDir.exists());
} }
@ -97,7 +98,8 @@ public class MusicSelectionPage extends Page {
} }
}); });
for (int music = startingID; music < musicFiles.length && music < 15; music++) { for (int music = startingID; music < musicFiles.length && music < 15; music++) {
musicChoices.add(new MusicSelectable(musicFiles[music], musicFileAnnotation, skin)); MusicSelectable selectable = new MusicSelectable(musicFiles[music], musicFileAnnotation, skin);
musicChoices.add(selectable).prefSize(0.2f*Gdx.graphics.getWidth(), 0.8f*Gdx.graphics.getHeight());
} }
} }
} }

6
core/src/zero1hd/wavedecoder/WavInfo.java
View File

@ -13,9 +13,11 @@ public class WavInfo {
private int byteRate; private int byteRate;
private FileInputStream audioFile; private FileInputStream audioFile;
private DataInputStream readStream; private DataInputStream readStream;
private String fileName;
public WavInfo(File file) throws InvalidParameterException { public WavInfo(File file) throws InvalidParameterException {
try { try {
fileName = file.getName();
audioFile = new FileInputStream(file); audioFile = new FileInputStream(file);
initDataStream(); initDataStream();
getHeaderInfo(); getHeaderInfo();
@ -58,8 +60,10 @@ public class WavInfo {
readStream.skipBytes(38); //38 readStream.skipBytes(38); //38
// System.out.println(readBytesToString(4).equals("data"));
if (!readBytesToString(4).equals("data")) { // 4 if (!readBytesToString(4).equals("data")) { // 4
throw new InvalidParameterException("initial data section tag not found"); throw new InvalidParameterException("initial data section tag not found on wav: " + fileName);
} }
} }