diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-22 11:26:53 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-22 11:26:53 +0100 |
| commit | 50a468d0a3c5555c9e6889696bd0397f17a6974c (patch) | |
| tree | 8d8b7bc211e7e2b5a91c25c86c5b7ae58e9e4a52 /community/xbmc/cdio.patch | |
| parent | bf6c93db356044781e343fe26da74d357b4beda3 (diff) | |
| parent | 6b3123e5628817e3cef9c44989dffd21c49b0817 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cksfv/PKGBUILD
extra/clutter-gtk2/PKGBUILD
extra/gnuplot/PKGBUILD
extra/mx/PKGBUILD
Diffstat (limited to 'community/xbmc/cdio.patch')
| -rw-r--r-- | community/xbmc/cdio.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/community/xbmc/cdio.patch b/community/xbmc/cdio.patch deleted file mode 100644 index 0f74deaa4..000000000 --- a/community/xbmc/cdio.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -wbBur xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp ---- xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp 2012-03-22 02:07:50.000000000 +0400 -+++ xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp 2013-01-09 14:40:10.670040454 +0400 -@@ -27,6 +27,10 @@ - #include "storage/MediaManager.h" - #include "utils/log.h" - -+#define CDTEXT_TITLE CDTEXT_FIELD_TITLE -+#define CDTEXT_PERFORMER CDTEXT_FIELD_PERFORMER -+#define CDTEXT_GENRE CDTEXT_FIELD_GENRE -+ - using namespace MUSIC_INFO; - - #ifdef HAS_DVD_DRIVE -diff -wbBur xbmc-11.0/xbmc/storage/cdioSupport.cpp xbmc-11.0.my/xbmc/storage/cdioSupport.cpp ---- xbmc-11.0/xbmc/storage/cdioSupport.cpp 2012-03-22 02:07:50.000000000 +0400 -+++ xbmc-11.0.my/xbmc/storage/cdioSupport.cpp 2013-01-09 14:51:40.276801092 +0400 -@@ -648,15 +648,18 @@ - CSingleLock lock(*m_cdio); - - // Get the CD-Text , if any -- cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio, trackNum); -+ cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio); - - if (pcdtext == NULL) - return ; - - // same ids used in libcdio and for our structure + the ids are consecutive make this copy loop safe. - for (int i = 0; i < MAX_CDTEXT_FIELDS; i++) -- if (pcdtext->field[i]) -- xcdt[(cdtext_field_t)i] = pcdtext->field[(cdtext_field_t)i]; -+ { -+ char *data = cdtext_get(pcdtext, (cdtext_field_t)i, trackNum); -+ if (data != NULL) -+ xcdt[(cdtext_field_t)i] = data; -+ } - } - - CCdInfo* CCdIoSupport::GetCdInfo(char* cDeviceFileName) |