diff options
| -rw-r--r-- | xbmc/ThumbLoader.cpp | 5 | ||||
| -rw-r--r-- | xbmc/cores/omxplayer/OMXVideo.cpp | 29 | ||||
| -rw-r--r-- | xbmc/music/MusicThumbLoader.cpp | 3 | ||||
| -rw-r--r-- | xbmc/video/VideoThumbLoader.cpp | 3 |
4 files changed, 23 insertions, 17 deletions
diff --git a/xbmc/ThumbLoader.cpp b/xbmc/ThumbLoader.cpp index 865b8436b1..4aa7b2c0ef 100644 --- a/xbmc/ThumbLoader.cpp +++ b/xbmc/ThumbLoader.cpp @@ -103,13 +103,12 @@ bool CProgramThumbLoader::FillThumb(CFileItem &item) if (thumb.empty()) { // see whether we have a cached image for this item - CProgramThumbLoader loader; - thumb = loader.GetCachedImage(item, "thumb"); + thumb = GetCachedImage(item, "thumb"); if (thumb.empty()) { thumb = GetLocalThumb(item); if (!thumb.empty()) - loader.SetCachedImage(item, "thumb", thumb); + SetCachedImage(item, "thumb", thumb); } } diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp index e0ea992521..6a4ce92a62 100644 --- a/xbmc/cores/omxplayer/OMXVideo.cpp +++ b/xbmc/cores/omxplayer/OMXVideo.cpp @@ -838,19 +838,24 @@ void COMXVideo::SetVideoRect(const CRect& SrcRect, const CRect& DestRect) configDisplay.fullscreen = OMX_FALSE; configDisplay.noaspect = OMX_TRUE; - configDisplay.set = (OMX_DISPLAYSETTYPE)(OMX_DISPLAY_SET_DEST_RECT|OMX_DISPLAY_SET_SRC_RECT|OMX_DISPLAY_SET_FULLSCREEN|OMX_DISPLAY_SET_NOASPECT); - configDisplay.dest_rect.x_offset = (int)(DestRect.x1+0.5f); - configDisplay.dest_rect.y_offset = (int)(DestRect.y1+0.5f); - configDisplay.dest_rect.width = (int)(DestRect.Width()+0.5f); - configDisplay.dest_rect.height = (int)(DestRect.Height()+0.5f); - - configDisplay.src_rect.x_offset = (int)(SrcRect.x1+0.5f); - configDisplay.src_rect.y_offset = (int)(SrcRect.y1+0.5f); - configDisplay.src_rect.width = (int)(SrcRect.Width()+0.5f); - configDisplay.src_rect.height = (int)(SrcRect.Height()+0.5f); - - configDisplay.fullscreen = configDisplay.dest_rect.width == 0 || configDisplay.dest_rect.width == 0 ? OMX_TRUE : OMX_FALSE; + if (configDisplay.dest_rect.width == 0 || configDisplay.dest_rect.height == 0) + { + configDisplay.set = OMX_DISPLAY_SET_FULLSCREEN; + configDisplay.fullscreen = OMX_TRUE; + } + else + { + configDisplay.set = (OMX_DISPLAYSETTYPE)(OMX_DISPLAY_SET_DEST_RECT|OMX_DISPLAY_SET_SRC_RECT|OMX_DISPLAY_SET_NOASPECT); + configDisplay.dest_rect.x_offset = (int)(DestRect.x1+0.5f); + configDisplay.dest_rect.y_offset = (int)(DestRect.y1+0.5f); + configDisplay.dest_rect.width = (int)(DestRect.Width()+0.5f); + configDisplay.dest_rect.height = (int)(DestRect.Height()+0.5f); + configDisplay.src_rect.x_offset = (int)(SrcRect.x1+0.5f); + configDisplay.src_rect.y_offset = (int)(SrcRect.y1+0.5f); + configDisplay.src_rect.width = (int)(SrcRect.Width()+0.5f); + configDisplay.src_rect.height = (int)(SrcRect.Height()+0.5f); + } m_omx_render.SetConfig(OMX_IndexConfigDisplayRegion, &configDisplay); CLog::Log(LOGDEBUG, "dest_rect.x_offset %d dest_rect.y_offset %d dest_rect.width %d dest_rect.height %d\n", diff --git a/xbmc/music/MusicThumbLoader.cpp b/xbmc/music/MusicThumbLoader.cpp index 7755b84dff..cb4039cbad 100644 --- a/xbmc/music/MusicThumbLoader.cpp +++ b/xbmc/music/MusicThumbLoader.cpp @@ -184,7 +184,8 @@ bool CMusicThumbLoader::FillThumb(CFileItem &item, bool folderThumbs /* = true * if (!thumb.empty()) SetCachedImage(item, "thumb", thumb); } - item.SetArt("thumb", thumb); + if (!thumb.empty()) + item.SetArt("thumb", thumb); return !thumb.empty(); } diff --git a/xbmc/video/VideoThumbLoader.cpp b/xbmc/video/VideoThumbLoader.cpp index 7291ecaec2..66eb7a955e 100644 --- a/xbmc/video/VideoThumbLoader.cpp +++ b/xbmc/video/VideoThumbLoader.cpp @@ -467,7 +467,8 @@ bool CVideoThumbLoader::FillThumb(CFileItem &item) if (!thumb.empty()) SetCachedImage(item, "thumb", thumb); } - item.SetArt("thumb", thumb); + if (!thumb.empty()) + item.SetArt("thumb", thumb); return !thumb.empty(); } |