Merge branch 'tildearrow:master' into master

CMakeLists.txt

@@ -14,7 +14,7 @@ set(CMAKE_CXX_STANDARD 14)
 
 set(CMAKE_PROJECT_VERSION_MAJOR 0)
 set(CMAKE_PROJECT_VERSION_MINOR 5)
-set(CMAKE_PROJECT_VERSION_PATCH 6)
+set(CMAKE_PROJECT_VERSION_PATCH 7)
 
 if (ANDROID)
   set(BUILD_GUI_DEFAULT OFF)

res/Info.plist

@@ -15,17 +15,17 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>0.5.6</string>
+	<string>0.5.7</string>
 	<key>CFBundleName</key>
 	<string>Furnace</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5.6</string>
+	<string>0.5.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.5.6</string>
+	<string>0.5.7</string>
 	<key>NSHumanReadableCopyright</key>
 	<string></string>
 	<key>NSHighResolutionCapable</key>

src/engine/engine.cpp

@@ -805,8 +805,8 @@ int DivEngine::calcBaseFreq(double clock, double divider, int note, bool period)
 int DivEngine::calcFreq(int base, int pitch, bool period, int octave) {
   if (song.linearPitch) {
     return period?
-            round(base*pow(2,-(double)pitch/(12.0*128.0))/(98.0+globalPitch*6.0)*98.0):
+            base*pow(2,-(double)pitch/(12.0*128.0))/(98.0+globalPitch*6.0)*98.0:
-            (round(base*pow(2,(double)pitch/(12.0*128.0))*(98+globalPitch*6))/98);
+            (base*pow(2,(double)pitch/(12.0*128.0))*(98+globalPitch*6))/98;
   }
   return period?
            base-pitch:
@@ -1196,8 +1196,24 @@ int DivEngine::addInstrument(int refChan) {
   return insCount;
 }
 
+enum DivInsFormats {
+  DIV_INSFORMAT_DMP,
+  DIV_INSFORMAT_TFI,
+  DIV_INSFORMAT_VGI,
+  DIV_INSFORMAT_FTI,
+  DIV_INSFORMAT_BTI
+};
+
 bool DivEngine::addInstrumentFromFile(const char *path) {
   warnings="";
+
+  const char* pathRedux=strrchr(path,DIR_SEPARATOR);
+  if (pathRedux==NULL) {
+    pathRedux="Instrument";
+  } else {
+    pathRedux++;
+  }
+
   FILE* f=ps_fopen(path,"rb");
   if (f==NULL) {
     lastError=strerror(errno);
@@ -1274,7 +1290,32 @@ bool DivEngine::addInstrumentFromFile(const char *path) {
       delete[] buf;
       return false;
     }
-  } else { // read as .dmp
+  } else { // read as a different format
+    const char* ext=strrchr(path,'.');
+    DivInsFormats format=DIV_INSFORMAT_DMP;
+    if (ext!=NULL) {
+      String extS;
+      for (; *ext; ext++) {
+        char i=*ext;
+        if (i>='A' && i<='Z') {
+          i+='a'-'A';
+        }
+        extS+=i;
+      }
+      if (extS==String(".dmp")) {
+        format=DIV_INSFORMAT_DMP;
+      } else if (extS==String(".tfi")) {
+        format=DIV_INSFORMAT_TFI;
+      } else if (extS==String(".vgi")) {
+        format=DIV_INSFORMAT_VGI;
+      } else if (extS==String(".fti")) {
+        format=DIV_INSFORMAT_FTI;
+      } else if (extS==String(".bti")) {
+        format=DIV_INSFORMAT_BTI;
+      }
+    }
+    switch (format) {
+      case DIV_INSFORMAT_DMP: {
         // this is a ridiculous mess
         unsigned char version=0;
         unsigned char sys=0;
@@ -1296,6 +1337,8 @@ bool DivEngine::addInstrumentFromFile(const char *path) {
           return false;
         }
 
+        ins->name=pathRedux;
+
         if (version>=11) { // 1.0
           try {
             sys=reader.readC();
@@ -1520,6 +1563,84 @@ bool DivEngine::addInstrumentFromFile(const char *path) {
           delete[] buf;
           return false;
         }
+        break;
+      }
+      case DIV_INSFORMAT_TFI:
+        try {
+          reader.seek(0,SEEK_SET);
+
+          ins->type=DIV_INS_FM;
+          ins->name=pathRedux;
+          
+          ins->fm.alg=reader.readC();
+          ins->fm.fb=reader.readC();
+
+          for (int i=0; i<4; i++) {
+            DivInstrumentFM::Operator& op=ins->fm.op[i];
+
+            op.mult=reader.readC();
+            op.dt=reader.readC();
+            op.tl=reader.readC();
+            op.rs=reader.readC();
+            op.ar=reader.readC();
+            op.dr=reader.readC();
+            op.d2r=reader.readC();
+            op.rr=reader.readC();
+            op.sl=reader.readC();
+            op.ssgEnv=reader.readC();
+          }
+        } catch (EndOfFileException e) {
+          lastError="premature end of file";
+          logE("premature end of file!\n");
+          delete ins;
+          delete[] buf;
+          return false;
+        }
+        break;
+      case DIV_INSFORMAT_VGI:
+        try {
+          reader.seek(0,SEEK_SET);
+
+          ins->type=DIV_INS_FM;
+          ins->name=pathRedux;
+          
+          ins->fm.alg=reader.readC();
+          ins->fm.fb=reader.readC();
+          unsigned char fmsams=reader.readC();
+          ins->fm.fms=fmsams&7;
+          ins->fm.ams=fmsams>>4;
+
+          for (int i=0; i<4; i++) {
+            DivInstrumentFM::Operator& op=ins->fm.op[i];
+
+            op.mult=reader.readC();
+            op.dt=reader.readC();
+            op.tl=reader.readC();
+            op.rs=reader.readC();
+            op.ar=reader.readC();
+            op.dr=reader.readC();
+            if (op.dr&0x80) {
+              op.am=1;
+              op.dr&=0x7f;
+            }
+            op.d2r=reader.readC();
+            op.rr=reader.readC();
+            op.sl=reader.readC();
+            op.ssgEnv=reader.readC();
+          }
+        } catch (EndOfFileException e) {
+          lastError="premature end of file";
+          logE("premature end of file!\n");
+          delete ins;
+          delete[] buf;
+          return false;
+        }
+        break;
+      case DIV_INSFORMAT_FTI:
+        break;
+      case DIV_INSFORMAT_BTI:
+        break;
+    }
 
     if (reader.tell()<reader.size()) {
       addWarning("https://github.com/tildearrow/furnace/issues/84");

src/engine/engine.h

@@ -37,8 +37,8 @@
     warnings+=(String("\n")+x); \
   }
 
-#define DIV_VERSION "0.5.7pre3"
+#define DIV_VERSION "0.5.7pre4"
-#define DIV_ENGINE_VERSION 51
+#define DIV_ENGINE_VERSION 52
 
 enum DivStatusView {
   DIV_STATUS_NOTHING=0,

src/gui/gui.cpp

@@ -5585,6 +5585,8 @@ FurnaceGUI::FurnaceGUI():
   loopRow(-1),
   loopEnd(-1),
   isClipping(0),
+  extraChannelButtons(0),
+  patNameTarget(-1),
   editControlsOpen(true),
   ordersOpen(true),
   insListOpen(true),
@@ -5609,13 +5611,13 @@ FurnaceGUI::FurnaceGUI():
   selecting(false),
   curNibble(false),
   orderNibble(false),
-  extraChannelButtons(false),
   followOrders(true),
   followPattern(true),
   changeAllOrders(false),
   collapseWindow(false),
   demandScrollX(false),
   fancyPattern(false),
+  wantPatName(false),
   curWindow(GUI_WINDOW_NOTHING),
   nextWindow(GUI_WINDOW_NOTHING),
   wavePreviewOn(false),

src/gui/gui.h

@@ -517,14 +517,14 @@ class FurnaceGUI {
   char finalLayoutPath[4096];
 
   int curIns, curWave, curSample, curOctave, oldRow, oldOrder, oldOrder1, editStep, exportLoops, soloChan, soloTimeout, orderEditMode, orderCursor;
-  int loopOrder, loopRow, loopEnd, isClipping;
+  int loopOrder, loopRow, loopEnd, isClipping, extraChannelButtons, patNameTarget;
   bool editControlsOpen, ordersOpen, insListOpen, songInfoOpen, patternOpen, insEditOpen;
   bool waveListOpen, waveEditOpen, sampleListOpen, sampleEditOpen, aboutOpen, settingsOpen;
   bool mixerOpen, debugOpen, oscOpen, volMeterOpen, statsOpen, compatFlagsOpen;
   bool pianoOpen, notesOpen, channelsOpen;
   SelectionPoint selStart, selEnd, cursor;
-  bool selecting, curNibble, orderNibble, extraChannelButtons, followOrders, followPattern, changeAllOrders;
+  bool selecting, curNibble, orderNibble, followOrders, followPattern, changeAllOrders;
-  bool collapseWindow, demandScrollX, fancyPattern;
+  bool collapseWindow, demandScrollX, fancyPattern, wantPatName;
   FurnaceGUIWindows curWindow, nextWindow;
   float peak[2];
   float patChanX[DIV_MAX_CHANS+1];

src/gui/pattern.cpp

@@ -17,10 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <imgui.h>
 #define _USE_MATH_DEFINES
 #include "gui.h"
 #include "imgui_internal.h"
 #include "IconsFontAwesome4.h"
+#include "misc/cpp/imgui_stdlib.h"
 #include "guiConst.h"
 #include <fmt/printf.h>
 
@@ -376,8 +378,8 @@ void FurnaceGUI::drawPattern() {
       }
       ImGui::TableNextRow();
       ImGui::TableNextColumn();
-      if (ImGui::Selectable(extraChannelButtons?" --##ExtraChannelButtons":" ++##ExtraChannelButtons",false,ImGuiSelectableFlags_NoPadWithHalfSpacing,ImVec2(0.0f,lineHeight+1.0f*dpiScale))) {
+      if (ImGui::Selectable((extraChannelButtons==2)?" --##ExtraChannelButtons":" ++##ExtraChannelButtons",false,ImGuiSelectableFlags_NoPadWithHalfSpacing,ImVec2(0.0f,lineHeight+1.0f*dpiScale))) {
-        extraChannelButtons=!extraChannelButtons;
+        if (++extraChannelButtons>2) extraChannelButtons=0;
       }
       if (ImGui::IsItemClicked(ImGuiMouseButton_Right)) {
         fancyPattern=!fancyPattern;
@@ -448,7 +450,34 @@ void FurnaceGUI::drawPattern() {
         if (settings.soloAction!=2) if (ImGui::IsItemClicked(ImGuiMouseButton_Right)) {
           e->toggleSolo(i);
         }
-        if (extraChannelButtons) {
+        if (extraChannelButtons==2) {
+          DivPattern* pat=e->song.pat[i].getPattern(e->song.orders.ord[i][ord],true);
+          ImGui::PushFont(mainFont);
+          if (patNameTarget==i) {
+            snprintf(chanID,2048,"##PatNameI%d_%d",i,ord);
+            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x-(8.0f*dpiScale));
+            ImGui::SetCursorPosX(ImGui::GetCursorPosX()+4.0f*dpiScale);
+            ImGui::InputText(chanID,&pat->name);
+            if (wantPatName) {
+              wantPatName=false;
+              ImGui::SetItemDefaultFocus();
+              ImGui::SetKeyboardFocusHere(-1);
+            } else {
+              if (!ImGui::IsItemActive()) {
+                patNameTarget=-1;
+              }
+            }
+          } else {
+            snprintf(chanID,2048," %s##PatName%d",pat->name.c_str(),i);
+            if (ImGui::Selectable(chanID,true,ImGuiSelectableFlags_NoPadWithHalfSpacing,ImVec2(0.0f,lineHeight+1.0f*dpiScale))) {
+              patNameTarget=i;
+              wantPatName=true;
+              snprintf(chanID,2048,"##PatNameI%d_%d",i,ord);
+              ImGui::SetActiveID(ImGui::GetID(chanID),ImGui::GetCurrentWindow());
+            }
+          }
+          ImGui::PopFont();
+        } else if (extraChannelButtons==1) {
           snprintf(chanID,2048,"%c##_HCH%d",e->song.chanCollapse[i]?'+':'-',i);
           ImGui::SetCursorPosX(ImGui::GetCursorPosX()+4.0f*dpiScale);
           if (ImGui::SmallButton(chanID)) {