Add file load button

src/MainComponent.cpp

@@ -5,7 +5,7 @@
 
 MainComponent::MainComponent() : _djPlayer{_threadPool, _formatManager}
 {
- setAudioDevices();
+ setupAudioDevices();
 
  addAndMakeVisible(_sideBarLeft);
  addAndMakeVisible(_sideBarRight);
@@ -18,6 +18,7 @@ MainComponent::MainComponent() : _djPlayer{_threadPool, _formatManager}
  else { _djPlayer.startPlayback(); }
  };
 
+ _sideBarLeft.onLoadClicked = [this]() { loadFile(); };
  _sideBarLeft.onCueClicked = [this]() { _djPlayer.positionRelative(0.0); };
  _sideBarRight.onTempoDeltaChanged = [this](double delta) { _djPlayer.speed((100.0 + delta) / 100.0); };
  _sideBarRight.onWaveformZoomChanged = [this](double zoom) { _display.waveformZoom(zoom); };
@@ -60,13 +61,27 @@ void MainComponent::resized()
  grid.performLayout(getLocalBounds().reduced(2));
 }
 
-auto MainComponent::setAudioDevices() -> void
+auto MainComponent::loadFile() -> void
+{
+ auto const* msg = "Please select the audio file you want to load...";
+ auto const dir = juce::File::getSpecialLocation(juce::File::userMusicDirectory);
+ auto const fileFlags = juce::FileBrowserComponent::openMode | juce::FileBrowserComponent::canSelectFiles;
+
+ auto load = [this](auto const& chooser)
+ {
+ auto file = chooser.getResult();
+ if (!file.existsAsFile()) { return; }
+ _djPlayer.loadFile(file);
+ };
+
+ _fileChooser = std::make_unique<juce::FileChooser>(msg, dir, _formatManager.getWildcardForAllFormats());
+ _fileChooser->launchAsync(fileFlags, load);
+}
+
+auto MainComponent::setupAudioDevices() -> void
 {
  _formatManager.registerBasicFormats();
  _deviceManager.initialiseWithDefaultDevices(0, 2);
  _deviceManager.addAudioCallback(&_audioPlayer);
  _audioPlayer.setSource(&_djPlayer);
-
- auto file = juce::File{"/home/tobante/Downloads/Lars_Huismann_Echo.mp3"};
- _djPlayer.loadFile(file);
 }

src/MainComponent.hpp

@@ -18,7 +18,8 @@ struct MainComponent final : juce::Component
  auto resized() -> void override;
 
 private:
- auto setAudioDevices() -> void;
+ auto loadFile() -> void;
+ auto setupAudioDevices() -> void;
 
  juce::ThreadPool _threadPool{juce::SystemStats::getNumCpus()};
 
@@ -32,5 +33,7 @@ struct MainComponent final : juce::Component
  ta::MainSection _jogWheel;
  ta::Display _display{_formatManager, _djPlayer};
 
+ std::unique_ptr<juce::FileChooser> _fileChooser{};
+
  JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(MainComponent) // NOLINT
 };

src/UI/Section/Display.cpp

@@ -62,6 +62,6 @@ auto Display::djPlayerFileAnalysisFinished(BeatTrackResult const& result) -> voi
  return;
  }
 
- _bpm.setText("Error:" + result.errorMessage(), juce::sendNotification);
+ _bpm.setText("Error detecting BPM", juce::sendNotification);
 }
 } // namespace ta

src/UI/Section/SideBarLeft.cpp

@@ -5,9 +5,14 @@ namespace ta
 SideBarLeft::SideBarLeft()
 {
  addAndMakeVisible(_placeholder);
+ addAndMakeVisible(_loadButton);
  addAndMakeVisible(_cueButton);
  addAndMakeVisible(_playButton);
 
+ _loadButton.onClick = [this]()
+ {
+ if (onLoadClicked) { onLoadClicked(); }
+ };
  _cueButton.onClick = [this]()
  {
  if (onCueClicked) { onCueClicked(); }
@@ -32,7 +37,8 @@ auto SideBarLeft::resized() -> void
  grid.templateRows = fillArray(Track(1_fr), 12);
  grid.templateColumns = fillArray(Track(1_fr), 1);
  grid.items.addArray({
- GridItem(_placeholder).withArea(GridItem::Span(10), {}),
+ GridItem(_loadButton).withArea(GridItem::Span(1), {}),
+ GridItem(_placeholder).withArea(GridItem::Span(9), {}),
  GridItem(_cueButton).withArea(GridItem::Span(1), {}),
  GridItem(_playButton).withArea(GridItem::Span(1), {}),
  });

src/UI/Section/SideBarLeft.hpp

@@ -12,11 +12,13 @@ struct SideBarLeft final : juce::Component
 
  auto resized() -> void override;
 
+ std::function<void()> onLoadClicked{};
  std::function<void()> onCueClicked{};
  std::function<void()> onPlayClicked{};
 
 private:
  Placeholder _placeholder{"", juce::Colours::transparentBlack};
+ juce::TextButton _loadButton{"Load"};
  juce::TextButton _cueButton{"Cue"};
  juce::TextButton _playButton{"Play"};