add intro tune, part 2

src/engine/engine.cpp

@@ -1469,6 +1469,42 @@ void DivEngine::createNew(const char* description, String sysName, bool inBase64
   BUSY_END;
 }
 
+void DivEngine::createNewFromDefaults() {
+  quitDispatch();
+  BUSY_BEGIN;
+  saveLock.lock();
+  song.unload();
+  song=DivSong();
+  changeSong(0);
+
+  String preset=getConfString("initialSys2","");
+  bool oldVol=getConfInt("configVersion",DIV_ENGINE_VERSION)<135;
+  if (preset.empty()) {
+    // try loading old preset
+    preset=decodeSysDesc(getConfString("initialSys",""));
+    oldVol=false;
+  }
+  logD("preset size %ld",preset.size());
+  if (preset.size()>0 && (preset.size()&3)==0) {
+    initSongWithDesc(preset.c_str(),true,oldVol);
+  }
+  String sysName=getConfString("initialSysName","");
+  if (sysName=="") {
+    song.systemName=getSongSystemLegacyName(song,!getConfInt("noMultiSystem",0));
+  } else {
+    song.systemName=sysName;
+  }
+
+  recalcChans();
+  saveLock.unlock();
+  BUSY_END;
+  initDispatch();
+  BUSY_BEGIN;
+  renderSamples();
+  reset();
+  BUSY_END;
+}
+
 void DivEngine::swapChannels(int src, int dest) {
   logV("swapping channel %d with %d",src,dest);
   if (src==dest) {

src/engine/engine.h

@@ -516,6 +516,7 @@ class DivEngine {
     String decodeSysDesc(String desc);
     // start fresh
     void createNew(const char* description, String sysName, bool inBase64=true);
+    void createNewFromDefaults();
     // load a file.
     bool load(unsigned char* f, size_t length);
     // save as .dmf.

src/engine/safeReader.h

@@ -40,7 +40,7 @@ struct EndOfFileException {
 };
 
 class SafeReader {
-  unsigned char* buf;
+  const unsigned char* buf;
   size_t len;
 
   size_t curSeek;
@@ -71,8 +71,8 @@ class SafeReader {
     String readStringToken();
     inline bool isEOF() { return curSeek >= len; };
 
-    SafeReader(void* b, size_t l):
-      buf((unsigned char*)b),
+    SafeReader(const void* b, size_t l):
+      buf((const unsigned char*)b),
       len(l),
       curSeek(0) {}
 };