Superminaren/sample-hive
1
0
Fork 0
mirror of https://gitlab.com/samplehive/sample-hive.git synced 2026-10-11 15:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved the logo a bit, changed the app icon to higher resolution one and replaced README.md with README.org

Browse Source
This commit is contained in:
apoorv569
2021-07-18 20:30:45 +05:30
parent f28072881b
commit 7bcf6f174a
17 changed files with 143 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include <wx/gdicmn.h>
#include <wx/splash.h>
#define SPLASH_LOGO SAMPLEHIVE_DATADIR "/assets/logo/logo-hive_768x432.png"
#define SPLASH_LOGO SAMPLEHIVE_DATADIR "/assets/logo/logo-samplehive_768x432.png"
wxIMPLEMENT_APP(App);
src/Database.cpp
+20 -4
View File
@@ -890,6 +890,10 @@ Database::LoadSamplesDatabase(const std::string& dbPath, wxVector<wxVector<wxVar
int trashed = sqlite3_column_int(m_Stmt, 10);
wxString hive_name = std::string(reinterpret_cast<const char*>(sqlite3_column_text(m_Stmt, 11)));
wxLongLong llLength = length;
int total_min = static_cast<int>((llLength / 60000).GetValue());
int total_sec = static_cast<int>(((llLength % 60000) / 1000).GetValue());
wxVector<wxVariant> vec;
if (trashed == 1)
@@ -977,7 +981,7 @@ Database::LoadSamplesDatabase(const std::string& dbPath, wxVector<wxVector<wxVar
vec.push_back(sample_pack);
vec.push_back(sample_type);
vec.push_back(wxString::Format("%d", channels));
vec.push_back(wxString::Format("%d", length));
vec.push_back(wxString::Format("%2i:%02i", total_min, total_sec));
vec.push_back(wxString::Format("%d", sample_rate));
vec.push_back(wxString::Format("%d", bitrate));
vec.push_back(path);
@@ -1046,6 +1050,10 @@ Database::FilterDatabaseBySampleName(const std::string& dbPath, wxVector<wxVecto
int bitrate = sqlite3_column_int(m_Stmt, 7);
wxString path = wxString(std::string(reinterpret_cast<const char*>(sqlite3_column_text(m_Stmt, 8))));
wxLongLong llLength = length;
int total_min = static_cast<int>((llLength / 60000).GetValue());
int total_sec = static_cast<int>(((llLength % 60000) / 1000).GetValue());
wxVector<wxVariant> vec;
wxVariant icon_filled, icon_empty;
@@ -1076,7 +1084,7 @@ Database::FilterDatabaseBySampleName(const std::string& dbPath, wxVector<wxVecto
vec.push_back(sample_pack);
vec.push_back(sample_type);
vec.push_back(wxString::Format("%d", channels));
vec.push_back(wxString::Format("%d", length));
vec.push_back(wxString::Format("%2i:%02i", total_min, total_sec));
vec.push_back(wxString::Format("%d", sample_rate));
vec.push_back(wxString::Format("%d", bitrate));
vec.push_back(path);
@@ -1144,6 +1152,10 @@ Database::FilterDatabaseByHiveName(const std::string& dbPath, wxVector<wxVector<
int bitrate = sqlite3_column_int(m_Stmt, 7);
wxString path = wxString(std::string(reinterpret_cast<const char*>(sqlite3_column_text(m_Stmt, 8))));
wxLongLong llLength = length;
int total_min = static_cast<int>((llLength / 60000).GetValue());
int total_sec = static_cast<int>(((llLength % 60000) / 1000).GetValue());
wxVector<wxVariant> vec;
wxVariant icon_filled, icon_empty;
@@ -1174,7 +1186,7 @@ Database::FilterDatabaseByHiveName(const std::string& dbPath, wxVector<wxVector<
vec.push_back(sample_pack);
vec.push_back(sample_type);
vec.push_back(wxString::Format("%d", channels));
vec.push_back(wxString::Format("%d", length));
vec.push_back(wxString::Format("%2i:%02i", total_min, total_sec));
vec.push_back(wxString::Format("%d", sample_rate));
vec.push_back(wxString::Format("%d", bitrate));
vec.push_back(path);
@@ -1410,6 +1422,10 @@ Database::RestoreFromTrashByFilename(const std::string& dbPath, const std::strin
int trashed = sqlite3_column_int(m_Stmt, 10);
wxString hive_name = std::string(reinterpret_cast<const char*>(sqlite3_column_text(m_Stmt, 11)));
wxLongLong llLength = length;
int total_min = static_cast<int>((llLength / 60000).GetValue());
int total_sec = static_cast<int>(((llLength % 60000) / 1000).GetValue());
wxVector<wxVariant> vec;
wxVariant icon_filled, icon_empty;
@@ -1431,7 +1447,7 @@ Database::RestoreFromTrashByFilename(const std::string& dbPath, const std::strin
vec.push_back(sample_pack);
vec.push_back(sample_type);
vec.push_back(wxString::Format("%d", channels));
vec.push_back(wxString::Format("%d", length));
vec.push_back(wxString::Format("%2i:%02i", total_min, total_sec));
vec.push_back(wxString::Format("%d", sample_rate));
vec.push_back(wxString::Format("%d", bitrate));
vec.push_back(path);
src/MainFrame.cpp
+15 -10
View File
@@ -72,7 +72,8 @@
#define ICON_HIVE_24px SAMPLEHIVE_DATADIR "/assets/icons/icon-hive_24x24.png"
#define ICON_HIVE_32px SAMPLEHIVE_DATADIR "/assets/icons/icon-hive_32x32.png"
#define ICON_HIVE_64px SAMPLEHIVE_DATADIR "/assets/icons/icon-hive_64x64.png"
#define ICON_HIVE_200px SAMPLEHIVE_DATADIR "/assets/icons/icon-hive_200x200.png"
#define ICON_HIVE_128px SAMPLEHIVE_DATADIR "/assets/icons/icon-hive_128x128.png"
#define ICON_HIVE_256px SAMPLEHIVE_DATADIR "/assets/icons/icon-hive_256x256.png"
#define ICON_STAR_FILLED_16px SAMPLEHIVE_DATADIR "/assets/icons/icon-star_filled_16x16.png"
#define ICON_STAR_EMPTY_16px SAMPLEHIVE_DATADIR "/assets/icons/icon-star_empty_16x16.png"
#define WAVEFORM_SVG SAMPLEHIVE_DATADIR "/assets/waveform.svg"
@@ -595,7 +596,11 @@ void MainFrame::AddSamples(wxArrayString& files)
sample.SetLength(tags.GetAudioInfo().length);
sample.SetSampleRate(tags.GetAudioInfo().sample_rate);
sample.SetBitrate(tags.GetAudioInfo().bitrate);
wxLongLong llLength = sample.GetLength();
int total_min = static_cast<int>((llLength / 60000).GetValue());
int total_sec = static_cast<int>(((llLength % 60000) / 1000).GetValue());
wxVector<wxVariant> data;
wxVariant icon = wxVariant(wxBitmap(ICON_STAR_EMPTY_16px));
@@ -608,7 +613,7 @@ void MainFrame::AddSamples(wxArrayString& files)
data.push_back(sample.GetSamplePack());
data.push_back("");
data.push_back(wxString::Format("%d", sample.GetChannels()));
data.push_back(wxString::Format("%d", sample.GetLength()));
data.push_back(wxString::Format("%2i:%02i", total_min, total_sec));
data.push_back(wxString::Format("%d", sample.GetSampleRate()));
data.push_back(wxString::Format("%d", sample.GetBitrate()));
data.push_back(path);
@@ -972,12 +977,12 @@ void MainFrame::UpdateElapsedTime(wxTimerEvent& event)
wxLongLong llLength, llTell;
llLength = m_MediaCtrl->Length();
int total_min = (int) (llLength / 60000).GetValue();
int total_sec = (int) ((llLength % 60000)/1000).GetValue();
int total_min = static_cast<int>((llLength / 60000).GetValue());
int total_sec = static_cast<int>(((llLength % 60000) / 1000).GetValue());
llTell = m_MediaCtrl->Tell();
int current_min = (int) (llTell / 60000).GetValue();
int current_sec = (int) ((llTell % 60000)/1000).GetValue();
int current_min = static_cast<int>((llTell / 60000).GetValue());
int current_sec = static_cast<int>(((llTell % 60000) / 1000).GetValue());
duration.Printf(wxT("%2i:%02i"), total_min, total_sec);
position.Printf(wxT("%2i:%02i"), current_min, current_sec);
@@ -2080,7 +2085,7 @@ void MainFrame::OnShowTrashContextMenu(wxTreeEvent& event)
selected_item_text = m_Trash->GetItemText(selected_item_ids[i]);
wxLogDebug("Count: %d :: Selected item text: %s",
(int)selected_item_ids.GetCount(), selected_item_text);
static_cast<int>(selected_item_ids.GetCount()), selected_item_text);
filename = GetFilenamePathAndExtension(selected_item_text).Filename;
@@ -2435,7 +2440,7 @@ void MainFrame::OnClickRestoreTrashItem(wxCommandEvent& event)
selected_item_text = m_Trash->GetItemText(selected_item_ids[i]);
wxLogDebug("Count: %d :: Selected item text: %s",
(int)selected_item_ids.GetCount(), selected_item_text);
static_cast<int>(selected_item_ids.GetCount()), selected_item_text);
filename = GetFilenamePathAndExtension(selected_item_text).Filename;
@@ -2561,7 +2566,7 @@ void MainFrame::LoadConfigFile()
this->SetSize(width, height);
this->SetMinSize(wxSize(width, height));
this->CenterOnScreen(wxBOTH);
this->SetIcon(wxIcon(ICON_HIVE_24px, wxICON_DEFAULT_TYPE, -1, -1));
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(_("Stopped"), 1);