[vlmc-devel] Library: Merge Library & MediaLibrary classes

[Hugo Beauzée-Luyssen]

vlmc | branch: medialibrary | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Aug 22 23:20:27 2016 +0200| [5f9be8ac522b560a3f686c8bd1e3f2f6ac85edb0] | committer: Hugo Beauzée-Luyssen

Library: Merge Library & MediaLibrary classes

> https://code.videolan.org/videolan/vlmc/commit/5f9be8ac522b560a3f686c8bd1e3f2f6ac85edb0
---

 Makefile.am                          |   3 -
 src/Gui/MainWindow.cpp               |   7 +-
 src/Gui/library/MediaLibraryView.cpp |   5 +-
 src/Library/Library.cpp              | 187 +++++++++++++++++++++++++++++++++-
 src/Library/Library.h                |  62 ++++++++++--
 src/Library/MediaLibrary.cpp         | 188 -----------------------------------
 src/Library/MediaLibrary.h           |  83 ----------------
 src/Main/Core.cpp                    |  10 +-
 src/Main/Core.h                      |   3 -
 src/Media/Media.cpp                  |   3 +-
 10 files changed, 243 insertions(+), 308 deletions(-)

Diff:   https://code.videolan.org/videolan/vlmc/commit/5f9be8ac522b560a3f686c8bd1e3f2f6ac85edb0