diff --git a/assets/screenshots/screenshot-samplehive-dark.png b/assets/screenshots/screenshot-samplehive-dark.png index b7292ed..e845616 100644 Binary files a/assets/screenshots/screenshot-samplehive-dark.png and b/assets/screenshots/screenshot-samplehive-dark.png differ diff --git a/assets/screenshots/screenshot-samplehive-light.png b/assets/screenshots/screenshot-samplehive-light.png index d652f72..182a7fb 100644 Binary files a/assets/screenshots/screenshot-samplehive-light.png and b/assets/screenshots/screenshot-samplehive-light.png differ diff --git a/src/App.cpp b/src/App.cpp index fc58dda..98be309 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -79,7 +79,7 @@ bool App::OnCmdLineParsed(wxCmdLineParser& parser) if (parser.Found("version")) { - std::cout << "SampleHive v0.8.4_alpha.1" << std::endl; + std::cout << "SampleHive v0.9.0_alpha.1" << std::endl; return false; } diff --git a/src/MainFrame.cpp b/src/MainFrame.cpp index 0d0cc5c..f6f8f9f 100644 --- a/src/MainFrame.cpp +++ b/src/MainFrame.cpp @@ -50,14 +50,12 @@ #include #include #include -// #include #include #include #include #include #include #include -// #include #include "MainFrame.hpp" #include "ControlID_Enums.hpp" @@ -426,7 +424,6 @@ MainFrame::MainFrame() Bind(wxEVT_TOGGLEBUTTON, &MainFrame::OnClickMute, this, BC_Mute); Bind(wxEVT_MEDIA_FINISHED, &MainFrame::OnMediaFinished, this, BC_MediaCtrl); Bind(wxEVT_BUTTON, &MainFrame::OnClickSettings, this, BC_Settings); - // Bind(wxEVT_TOGGLEBUTTON, &MainFrame::OnClickLoopABButton, this, BC_LoopABButton); Bind(wxEVT_CHECKBOX, &MainFrame::OnCheckAutoplay, this, BC_Autoplay); Bind(wxEVT_SCROLL_THUMBTRACK, &MainFrame::OnSlideVolume, this, BC_Volume); Bind(wxEVT_SCROLL_THUMBRELEASE, &MainFrame::OnReleaseVolumeSlider, this, BC_Volume); @@ -2645,7 +2642,7 @@ void MainFrame::LoadConfigFile() this->CenterOnScreen(wxBOTH); this->SetIcon(wxIcon(ICON_HIVE_256px, wxICON_DEFAULT_TYPE, -1, -1)); this->SetTitle("SampleHive"); - this->SetStatusText("SampleHive v0.8.4_alpha.1", 3); + this->SetStatusText("SampleHive v0.9.0_alpha.1", 3); this->SetStatusText(_("Stopped"), 1); } @@ -2890,21 +2887,21 @@ void MainFrame::OnSelectAbout(wxCommandEvent& event) aboutInfo.SetName("SampleHive"); aboutInfo.SetIcon(wxIcon(ICON_HIVE_64px)); aboutInfo.AddArtist("Apoorv"); - aboutInfo.SetVersion("v0.8.4_alpha.1", _("Version 0.8.4_alpha.1")); + aboutInfo.SetVersion("v0.9.0_alpha.1", _("Version 0.9.0_alpha.1")); aboutInfo.SetDescription(_("A simple, modern audio sample browser/manager for GNU/Linux.")); aboutInfo.SetCopyright("(C) 2020-2021"); aboutInfo.SetWebSite("http://samplehive.gitlab.io"); aboutInfo.AddDeveloper("Apoorv"); aboutInfo.SetLicence(wxString::FromAscii( - "SampleHive v0.8.4_alpha.1\n" + "SampleHive v0.9.0_alpha.1\n" "Copyright (C) 2021 Apoorv Singh\n" "\n" - "This program is free software: you can redistribute it and/or modify\n" + "SampleHive is free software: you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" "the Free Software Foundation, either version 3 of the License, or\n" "(at your option) any later version.\n" "\n" - "This program is distributed in the hope that it will be useful,\n" + "SampleHive is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" "GNU General Public License for more details.\n" @@ -2935,11 +2932,6 @@ void MainFrame::SetAfterFrameCreate() m_BottomSplitter->SetSashPosition(300); } -void MainFrame::OnClickLoopABButton(wxCommandEvent& event) -{ - wxLogDebug("Loop point button clicked"); -} - void MainFrame::OnRecieveLoopPoints(SampleHive::SH_LoopPointsEvent& event) { wxLogDebug("%s called and recieved loop points", __FUNCTION__); diff --git a/src/MainFrame.hpp b/src/MainFrame.hpp index ed3034d..5e18559 100644 --- a/src/MainFrame.hpp +++ b/src/MainFrame.hpp @@ -175,8 +175,12 @@ class MainFrame : public wxFrame // FileSystemWatcher wxFileSystemWatcher* m_FsWatcher; + // ------------------------------------------------------------------- wxLongLong m_LoopA, m_LoopB; + // ------------------------------------------------------------------- + wxSystemAppearance m_Theme = wxSystemSettings::GetAppearance(); + private: // ------------------------------------------------------------------- bool bAutoplay = false; @@ -186,9 +190,6 @@ class MainFrame : public wxFrame bool bFiltered = false; bool bLoopPointsSet = false; - // ------------------------------------------------------------------- - wxSystemAppearance m_Theme = wxSystemSettings::GetAppearance(); - // ------------------------------------------------------------------- const std::string m_ConfigFilepath; const std::string m_DatabaseFilepath; @@ -205,7 +206,6 @@ class MainFrame : public wxFrame void OnSlideVolume(wxScrollEvent& event); void OnReleaseVolumeSlider(wxScrollEvent& event); void OnClickSettings(wxCommandEvent& event); - void OnClickLoopABButton(wxCommandEvent& event); // ------------------------------------------------------------------- // DirCtrl event handlers @@ -264,7 +264,8 @@ class MainFrame : public wxFrame void OnAutoImportDir(const wxString& pathToDirectory); // ------------------------------------------------------------------- - void PlaySample(const std::string& filepath, const std::string& sample, bool seek = false, wxFileOffset where = NULL, wxSeekMode mode = wxFromStart); + void PlaySample(const std::string& filepath, const std::string& sample, bool seek = false, + wxFileOffset where = NULL, wxSeekMode mode = wxFromStart); // Recieve custom events // ------------------------------------------------------------------- diff --git a/src/WaveformViewer.cpp b/src/WaveformViewer.cpp index 15715c0..f50342f 100644 --- a/src/WaveformViewer.cpp +++ b/src/WaveformViewer.cpp @@ -74,7 +74,6 @@ void WaveformViewer::OnPaint(wxPaintEvent& event) wxLogDebug("Updating waveform bitmap.."); m_WaveformBitmap = wxBitmap(wxImage(size.x, size.y), 32); - // m_WaveformBitmap.Create(size.x, size.y, 32); UpdateWaveformBitmap(); @@ -82,7 +81,6 @@ void WaveformViewer::OnPaint(wxPaintEvent& event) } dc.DrawBitmap(m_WaveformBitmap, 0, 0, false); - // m_WaveformBitmap.SaveFile("waveform.png", wxBITMAP_TYPE_PNG); RenderPlayhead(dc);