From 779b027d1117bee23c59d2017f43b1ea4eb21081 Mon Sep 17 00:00:00 2001
From: apoorv569 <apoorvs569@gmail.com>
Date: Mon, 19 Jul 2021 09:02:58 +0530
Subject: [PATCH] Replaced wxSVG with wxStaticBitmap and removed the
 `libwxsvg-dev` and `libwxsvg3` from dependencies.

---
 README.org        | 2 +-
 meson.build       | 3 +--
 src/MainFrame.cpp | 4 +---
 src/MainFrame.hpp | 5 +----
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/README.org b/README.org
index 5e56657..01bb4ae 100644
--- a/README.org
+++ b/README.org
@@ -53,7 +53,7 @@ sudo pacman -S wxgtk3 wxsvg sqlite taglib yaml-cpp
 On Debian, Ubuntu and distributions based the on two,
 
 #+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
 
 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.
diff --git a/meson.build b/meson.build
index 8dcefff..e81a9e8 100755
--- a/meson.build
+++ b/meson.build
@@ -72,7 +72,6 @@ endforeach
 
 # Dependencies
 wx = dependency('wxwidgets', version: '>=3.0.4')
-wxsvg = dependency('libwxsvg')
 taglib = dependency('taglib', version: '>=1.11')
 sqlite3 = dependency('sqlite3')
 yaml = dependency('yaml-cpp')
@@ -87,5 +86,5 @@ executable('SampleHive',
            sources: src,
            cpp_args: [wx_cxx_flags],
            link_args: [wx_libs],
-           dependencies: [wx, wxsvg, taglib, sqlite3, yaml],
+           dependencies: [wx, taglib, sqlite3, yaml],
            install: true)
diff --git a/src/MainFrame.cpp b/src/MainFrame.cpp
index f7d1919..762fb0d 100644
--- a/src/MainFrame.cpp
+++ b/src/MainFrame.cpp
@@ -255,9 +255,7 @@ MainFrame::MainFrame()
 
     // Temporary widget to show a waveform sample image
     // TODO: Replace with actual waveform display
-    m_WaveformViewer = new wxSVGCtrl(m_TopPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize);
-    m_WaveformViewer->Load(WAVEFORM_SVG);
-    m_WaveformViewer->Show();
+    m_WaveformViewer = new wxStaticBitmap(m_TopPanel, wxID_ANY, wxBitmap(WAVEFORM_SVG));
 
     // Initialize browser control buttons
     m_PlayButton = new wxButton(m_TopPanel, BC_Play, _("Play"), wxDefaultPosition, wxDefaultSize, 0);
diff --git a/src/MainFrame.hpp b/src/MainFrame.hpp
index 8289e67..319d00d 100644
--- a/src/MainFrame.hpp
+++ b/src/MainFrame.hpp
@@ -51,9 +51,6 @@
 #include <wx/treectrl.h>
 #include <wx/window.h>
 
-#include <wxSVG/svgctrl.h>
-#include <wxSVG/SVGDocument.h>
-
 #include <taglib/taglib.h>
 #include <taglib/fileref.h>
 #include <taglib/tstring.h>
@@ -112,7 +109,7 @@ class MainFrame : public wxFrame
         wxBoxSizer* m_TopSizer;
         wxBoxSizer* m_TopPanelMainSizer;
         wxBoxSizer* m_WaveformDisplaySizer;
-        wxSVGCtrl* m_WaveformViewer;
+        wxStaticBitmap* m_WaveformViewer;
         wxBoxSizer* m_BrowserControlSizer;
         wxButton* m_PlayButton;
         wxToggleButton* m_LoopButton;