diff --git a/data/pictures/backgrounds/1920x1080/logo.jpg b/data/pictures/backgrounds/1920x1080/logo.jpg new file mode 100644 index 000000000..91c32fca0 Binary files /dev/null and b/data/pictures/backgrounds/1920x1080/logo.jpg differ diff --git a/data/pictures/backgrounds/Makefile.am b/data/pictures/backgrounds/Makefile.am index 34e92db04..7bcbb4626 100644 --- a/data/pictures/backgrounds/Makefile.am +++ b/data/pictures/backgrounds/Makefile.am @@ -1,11 +1,17 @@ installdir = $(ICONSDIR) -resolution = 1280x720 +res0 = 1280x720 install_DATA = \ - $(resolution)/blackscreen.jpg \ - $(resolution)/mp3.jpg \ - $(resolution)/radiomode.jpg \ - $(resolution)/scan.jpg \ - $(resolution)/shutdown.jpg \ - $(resolution)/start.jpg + $(res0)/blackscreen.jpg \ + $(res0)/mp3.jpg \ + $(res0)/radiomode.jpg \ + $(res0)/scan.jpg \ + $(res0)/shutdown.jpg \ + $(res0)/start.jpg + + +res1 = 1920x1080 + +install_DATA += \ + $(res1)/logo.jpg diff --git a/src/gui/components/cc_item_tvpic.cpp b/src/gui/components/cc_item_tvpic.cpp index 4397b09f9..4802ba3cb 100644 --- a/src/gui/components/cc_item_tvpic.cpp +++ b/src/gui/components/cc_item_tvpic.cpp @@ -52,8 +52,7 @@ CComponentsPIP::CComponentsPIP( const int x_pos, const int y_pos, const int perc //CComponentsPIP screen_w = frameBuffer->getScreenWidth(true); screen_h = frameBuffer->getScreenHeight(true); - pic_name = LOGODIR; - pic_name += "/logo.jpg"; + pic_name = frameBuffer->getIconPath("logo", "jpg"); //CComponents x = x_pos;