Superminaren
/
sample-hive
mirror of https://gitlab.com/samplehive/sample-hive.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaced wxSVG with wxStaticBitmap and removed the `libwxsvg-dev` and `libwxsvg3` from dependencies.

This commit is contained in:
apoorv569 2021-07-19 09:02:58 +05:30
parent 25a4c1a5cc
commit 779b027d11
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.org
View File

@ -53,7 +53,7 @@ sudo pacman -S wxgtk3 wxsvg sqlite taglib yaml-cpp
On Debian, Ubuntu and distributions based the on two, On Debian, Ubuntu and distributions based the on two,
#+begin_example #+begin_example
sudo apt install libwxbase3.0-dev libwxgtk-media3.0-gtk3-dev libwxgtk3.0-gtk3-dev wx3.0-headers libwxsvg-dev libwxsvg3 libsqlite3-dev libyaml-cpp-dev libtagc0-dev libtag1-dev libtagc0 libexif-dev libpango1.0-dev sudo apt install libwxbase3.0-dev libwxgtk-media3.0-gtk3-dev libwxgtk3.0-gtk3-dev wx3.0-headers libsqlite3-dev libyaml-cpp-dev libtagc0-dev libtag1-dev libtagc0 libexif-dev libpango1.0-dev
#+end_example #+end_example
You might also need to install =git=, =meson= and =g++= as well, if you don't already have them installed in order to build SampleHive. You might also need to install =git=, =meson= and =g++= as well, if you don't already have them installed in order to build SampleHive.

3
meson.build
View File

@ -72,7 +72,6 @@ endforeach
# Dependencies # Dependencies
wx = dependency('wxwidgets', version: '>=3.0.4') wx = dependency('wxwidgets', version: '>=3.0.4')
wxsvg = dependency('libwxsvg')
taglib = dependency('taglib', version: '>=1.11') taglib = dependency('taglib', version: '>=1.11')
sqlite3 = dependency('sqlite3') sqlite3 = dependency('sqlite3')
yaml = dependency('yaml-cpp') yaml = dependency('yaml-cpp')
@ -87,5 +86,5 @@ executable('SampleHive',
sources: src, sources: src,
cpp_args: [wx_cxx_flags], cpp_args: [wx_cxx_flags],
link_args: [wx_libs], link_args: [wx_libs],
dependencies: [wx, wxsvg, taglib, sqlite3, yaml], dependencies: [wx, taglib, sqlite3, yaml],
install: true) install: true)

4
src/MainFrame.cpp
View File

@ -255,9 +255,7 @@ MainFrame::MainFrame()
// Temporary widget to show a waveform sample image // Temporary widget to show a waveform sample image
// TODO: Replace with actual waveform display // TODO: Replace with actual waveform display
m_WaveformViewer = new wxSVGCtrl(m_TopPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); m_WaveformViewer = new wxStaticBitmap(m_TopPanel, wxID_ANY, wxBitmap(WAVEFORM_SVG));
m_WaveformViewer->Load(WAVEFORM_SVG);
m_WaveformViewer->Show();
// Initialize browser control buttons // Initialize browser control buttons
m_PlayButton = new wxButton(m_TopPanel, BC_Play, _("Play"), wxDefaultPosition, wxDefaultSize, 0); m_PlayButton = new wxButton(m_TopPanel, BC_Play, _("Play"), wxDefaultPosition, wxDefaultSize, 0);

5
src/MainFrame.hpp
View File

@ -51,9 +51,6 @@
#include <wx/treectrl.h> #include <wx/treectrl.h>
#include <wx/window.h> #include <wx/window.h>
#include <wxSVG/svgctrl.h>
#include <wxSVG/SVGDocument.h>
#include <taglib/taglib.h> #include <taglib/taglib.h>
#include <taglib/fileref.h> #include <taglib/fileref.h>
#include <taglib/tstring.h> #include <taglib/tstring.h>
@ -112,7 +109,7 @@ class MainFrame : public wxFrame
wxBoxSizer* m_TopSizer; wxBoxSizer* m_TopSizer;
wxBoxSizer* m_TopPanelMainSizer; wxBoxSizer* m_TopPanelMainSizer;
wxBoxSizer* m_WaveformDisplaySizer; wxBoxSizer* m_WaveformDisplaySizer;
wxSVGCtrl* m_WaveformViewer; wxStaticBitmap* m_WaveformViewer;
wxBoxSizer* m_BrowserControlSizer; wxBoxSizer* m_BrowserControlSizer;
wxButton* m_PlayButton; wxButton* m_PlayButton;
wxToggleButton* m_LoopButton; wxToggleButton* m_LoopButton;