diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-04-04 13:41:32 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-05 17:17:47 +0100 |
| commit | d8e80ce96801510fde0a256d92dc5fac8adfe22c (patch) | |
| tree | e167e1e4dcbccab111327b4748ef5140640852f6 | |
| parent | 1feb5dd5ceb44e2647abc52a13d05f62bf4c903c (diff) | |
| download | usdx-d8e80ce96801510fde0a256d92dc5fac8adfe22c.tar.gz usdx-d8e80ce96801510fde0a256d92dc5fac8adfe22c.tar.xz usdx-d8e80ce96801510fde0a256d92dc5fac8adfe22c.zip | |
renamed Song::cover to Song::cover_file and added Texture* Song::cover
| -rw-r--r-- | src/base/song.cpp | 6 | ||||
| -rw-r--r-- | src/base/song.hpp | 7 | ||||
| -rw-r--r-- | test/base/songloading.cpp | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/base/song.cpp b/src/base/song.cpp index 959102c2..9b0cbf12 100644 --- a/src/base/song.cpp +++ b/src/base/song.cpp @@ -51,7 +51,7 @@ namespace usdx bpm.push_back(new BPM(get_header_tag_float(L"BPM", true))); gap = get_header_tag_float(L"GAP"); - cover = get_header_tag(L"COVER"); + cover_file = get_header_tag(L"COVER"); background = get_header_tag(L"BACKGROUND"); video = get_header_tag(L"VIDEO"); @@ -226,9 +226,9 @@ namespace usdx return gap; } - const std::wstring& Song::get_cover(void) const + const std::wstring& Song::get_cover_file(void) const { - return cover; + return cover_file; } const std::wstring& Song::get_background(void) const diff --git a/src/base/song.hpp b/src/base/song.hpp index 2217e244..d0c06c9a 100644 --- a/src/base/song.hpp +++ b/src/base/song.hpp @@ -34,6 +34,7 @@ #include <log4cxx/logger.h> #include "bpm.hpp" #include "lyric_line.hpp" +#include "texture.hpp" #include "utils/base_exception.hpp" namespace usdx @@ -74,8 +75,8 @@ namespace usdx std::wstring video; float video_gap; - std::wstring cover; - // texture cover_tex; + std::wstring cover_file; + Texture* cover; std::wstring genre; std::wstring edition; @@ -127,7 +128,7 @@ namespace usdx const std::wstring& get_mp3(void) const; const float get_bpm(int beat) const; const float get_gap(void) const; - const std::wstring& get_cover(void) const; + const std::wstring& get_cover_file(void) const; const std::wstring& get_background(void) const; const std::wstring& get_video(void) const; const float get_video_gap(void) const; diff --git a/test/base/songloading.cpp b/test/base/songloading.cpp index 5be46fe6..1f5d2350 100644 --- a/test/base/songloading.cpp +++ b/test/base/songloading.cpp @@ -71,7 +71,7 @@ namespace usdx CPPUNIT_ASSERT( 42.23f == song->get_bpm(10) ); CPPUNIT_ASSERT( 10 == song->get_gap() ); CPPUNIT_ASSERT( L"Test[BG].jpg" == song->get_background() ); - CPPUNIT_ASSERT( L"Test[CO].jpg" == song->get_cover() ); + CPPUNIT_ASSERT( L"Test[CO].jpg" == song->get_cover_file() ); CPPUNIT_ASSERT( L"Test Genre" == song->get_genre() ); CPPUNIT_ASSERT( false == song->get_relative() ); CPPUNIT_ASSERT( L"Cpp" == song->get_language() ); |