Jason Brooke ext rename fix. remote load thread problem. etc

sasq64 · Dec 13, 2015 · 90b28a5 · 90b28a5
1 parent 75e97dd
commit 90b28a5
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/music/Amiga/rho.Rob Hubbard - Gold Runner b/music/Amiga/rho.Rob Hubbard - Gold Runner
diff --git a/src/ChipMachine.cpp b/src/ChipMachine.cpp
@@ -304,7 +304,7 @@ void ChipMachine::update() {
 
 		auto sub_title = player.getMeta("sub_title");
 
-		int tw = font.get_width(currentInfo.title, currentInfoField[0].scale);
+		int tw = currentInfoField.getWidth(0);
 
 		auto f = [=]() {
 			xinfoField.setText(sub_title);

diff --git a/src/MusicPlayerList.cpp b/src/MusicPlayerList.cpp
@@ -98,11 +98,8 @@ void MusicPlayerList::seek(int song, int seconds) {
 	if(!checkPermission(CAN_SEEK))
 		return;
 	if(multiSongs.size()) {
-		currentInfo.path = multiSongs[song];
-		changedMulti = true;
 		LOGD("CHANGED MULTI");
-		playCurrent();
-		//changedSong = true;
+		state = PLAY_MULTI;
 		multiSongNo = song;
 		return;
 	}
@@ -146,7 +143,8 @@ int MusicPlayerList::listSize() {
 
 /// PRIVATE
 
-bool MusicPlayerList::playFile(const std::string &fileName) {
+bool MusicPlayerList::playFile(const std::string &fn) {
+	auto fileName = fn;
 	if(fileName == "")
 		return false;
 	auto ext = toLower(path_extension(fileName));
@@ -209,6 +207,14 @@ bool MusicPlayerList::playFile(const std::string &fileName) {
 		SET_STATE(WAITING);
 		return true;
 	}
+	else
+	if(ext == "jb") {
+		// Jason Brooke fix
+		string newName = fileName.substr(0, fileName.find_last_of('.')) + ".jcb";
+		if(!File::exists(newName))
+			File::copy(fileName, newName);
+		fileName = newName;
+	}
 
 	if(mp.playFile(fileName)) {
 #ifdef USE_REMOTELISTS
@@ -273,6 +279,13 @@ void MusicPlayerList::update() {
 		playCurrent();
 	}
 
+	if(state == PLAY_MULTI) {
+		SET_STATE(STARTED);
+		currentInfo.path = multiSongs[multiSongNo];
+		changedMulti = true;
+		playCurrent();
+	}
+
 	if(state == PLAYING || state == PLAY_STARTED) {
 
 		auto pos = mp.getPosition();

diff --git a/src/MusicPlayerList.h b/src/MusicPlayerList.h
@@ -37,7 +37,8 @@ class MusicPlayerList {
 		PLAY_STARTED,
 		PLAYING,
 		FADING,
-		PLAY_NOW
+		PLAY_NOW,
+		PLAY_MULTI
 	};
 
 	MusicPlayerList(const std::string &workDir);

diff --git a/src/SongInfoField.h b/src/SongInfoField.h
@@ -37,6 +37,10 @@ struct SongInfoField : public Renderable {
 		fields[2]->setText(info.format);
 	}
 
+	int getWidth(int no) {
+		return fields[no]->getWidth();
+	}
+
 	SongInfoField& operator=(const SongInfoField &other) {
 		for(int i=0; i<3; i++)
 			fields[i]->setText(other.fields[i]->getText());