diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | imageloader.c | 2 | ||||
| -rw-r--r-- | themes/nOpacity-goldblue.theme | 63 | ||||
| -rw-r--r-- | themes/nOpacity-softblue.theme | 63 |
4 files changed, 6 insertions, 130 deletions
@@ -46,12 +46,14 @@ PACKAGE = vdr-$(ARCHIVE) SOFILE = libvdr-$(PLUGIN).so -### Includes and Defines (add further entries here): +### Includes and Defines and Dependencies (add further entries here): -INCLUDES += -I/usr/include/ImageMagick +INCLUDES += $(shell pkg-config --cflags-only-I Magick++) DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +LIBS += $(shell pkg-config --libs Magick++) + ### The object files (add further files here): OBJS = $(PLUGIN).o @@ -103,7 +105,7 @@ install-i18n: $(I18Nmsgs) ### Targets: $(SOFILE): $(OBJS) - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lMagick++ -o $@ + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@ install-lib: $(SOFILE) install -D $^ $(LIBDIR)/$^.$(APIVERSION) diff --git a/imageloader.c b/imageloader.c index 223f744..1676175 100644 --- a/imageloader.c +++ b/imageloader.c @@ -34,7 +34,7 @@ bool cImageLoader::LoadLogo(const char *logo, int width = config.logoWidth, int } bool cImageLoader::LoadIcon(const char *cIcon, int size) { - if (size==0) + if (size==0) return false; bool success = false; if (config.iconPathSet) { diff --git a/themes/nOpacity-goldblue.theme b/themes/nOpacity-goldblue.theme deleted file mode 100644 index 6045974..0000000 --- a/themes/nOpacity-goldblue.theme +++ /dev/null @@ -1,63 +0,0 @@ -Description = Gold Blue -clrChannelBackground = B0000000 -clrChannelBackBlend = B0003DF5 -clrChannelHead = FFFFD700 -clrChannelEPG = FFFFFFFF -clrChannelEPGInfo = FF858585 -clrProgressBar = DD7CFC00 -clrProgressBarBack = DD858585 -clrProgressBarBlend = DD006400 -clrChannelSymbolOn = DD003DF5 -clrChannelSymbolOff = DD858585 -clrChannelRecActive = DDFF0000 -clrReplayBackground = B0000000 -clrReplayBackBlend = B0003DF5 -clrReplayHead = FFFFFFFF -clrReplayDescription = FF858585 -clrReplayCurrentTotal = FF003DF5 -clrReplayProgressSeen = DD003DF5 -clrReplayProgressRest = DD858585 -clrReplayProgressSelected = FF000000 -clrReplayProgressMark = FF000000 -clrReplayProgressCurrent = 90FFFFFF -clrReplayHighlightIcon = DD003DF5 -clrTracksFontHead = FF858585 -clrTracksFontButtons = FFFFFFFF -clrVolumeFont = FF858585 -clrMenuBack = DD000000 -clrMenuBorder = DD003DF5 -clrMenuScrollBar = DD003DF5 -clrMenuScrollBarBack = 40003DF5 -clrMenuItem = EE444444 -clrMenuItemBlend = 90000000 -clrMenuItemHigh = DD000000 -clrMenuItemHighBlend = EEFFD700 -clrDiskAlert = DDFF0000 -clrMenuFontHeader = FFFFFFFF -clrMenuFontDate = FFFFFFFF -clrMenuFontDiscUsage = FFFFFFFF -clrMenuFontButton = FFFFFFFF -clrMenuFontTimers = FFFFFFFF -clrMenuFontTimersHeader = FFFFFFFF -clrMenuFontMessages = FFFFFFFF -clrMenuFontDetailViewText = FFFFFFFF -clrMenuFontDetailViewHeader = FF858585 -clrMenuFontDetailViewHeaderTitle = FF0066FF -clrMenuFontMenuItem = FFFFFFFF -clrMenuFontMenuItemHigh = FF000000 -clrMenuFontMenuItemTitle = FF0066FF -clrMenuFontMenuItemSep = FF858585 -clrButtonRed = 99BB0000 -clrButtonRedBorder = FFBB0000 -clrButtonGreen = 9900BB00 -clrButtonGreenBorder = FF00BB00 -clrButtonYellow = 99BBBB00 -clrButtonYellowBorder = FFBBBB00 -clrButtonBlue = 990000BB -clrButtonBlueBorder = FF0000BB -clrMessageFont = FFFFFFFF -clrMessageStatus = 900000FF -clrMessageInfo = 90009900 -clrMessageWarning = 90BBBB00 -clrMessageError = 90BB0000 -clrMessageBlend = DD000000 diff --git a/themes/nOpacity-softblue.theme b/themes/nOpacity-softblue.theme deleted file mode 100644 index 52f3cf9..0000000 --- a/themes/nOpacity-softblue.theme +++ /dev/null @@ -1,63 +0,0 @@ -Description = Soft Blue -clrChannelBackground = B0000000 -clrChannelBackBlend = B0858585 -clrChannelHead = FFEEEEEE -clrChannelEPG = FFFFFFFF -clrChannelEPGInfo = FF858585 -clrProgressBar = DD082A43 -clrProgressBarBack = DD858585 -clrProgressBarBlend = DD80B3FF -clrChannelSymbolOn = DD003DF5 -clrChannelSymbolOff = DD858585 -clrChannelRecActive = DDFF0000 -clrReplayBackground = B0000000 -clrReplayBackBlend = B0858585 -clrReplayHead = FFFFFFFF -clrReplayDescription = FFBBBBBB -clrReplayCurrentTotal = FFB6C6E0 -clrReplayProgressSeen = EEB6C6E0 -clrReplayProgressRest = CC618A9E -clrReplayProgressSelected = FF000000 -clrReplayProgressMark = FF000000 -clrReplayProgressCurrent = 90FFFFFF -clrReplayHighlightIcon = DDB6C6E0 -clrTracksFontHead = FF858585 -clrTracksFontButtons = FFFFFFFF -clrVolumeFont = FF858585 -clrMenuBack = DD031B3C -clrMenuBorder = DD135474 -clrMenuScrollBar = DD135474 -clrMenuScrollBarBack = 40135474 -clrMenuItem = EE444444 -clrMenuItemBlend = 90000000 -clrMenuItemHigh = DD618A9E -clrMenuItemHighBlend = EE135474 -clrDiskAlert = DDFF0000 -clrMenuFontHeader = FFFFFFFF -clrMenuFontDate = FFFFFFFF -clrMenuFontDiscUsage = FFFFFFFF -clrMenuFontButton = FFFFFFFF -clrMenuFontTimers = FFFFFFFF -clrMenuFontTimersHeader = FFFFFFFF -clrMenuFontMessages = FFFFFFFF -clrMenuFontDetailViewText = FFFFFFFF -clrMenuFontDetailViewHeader = FF858585 -clrMenuFontDetailViewHeaderTitle = FFB6C6E0 -clrMenuFontMenuItem = FFFFFFFF -clrMenuFontMenuItemHigh = FFFFFFFF -clrMenuFontMenuItemTitle = FFB6C6E0 -clrMenuFontMenuItemSep = FF858585 -clrButtonRed = 99BB0000 -clrButtonRedBorder = FFBB0000 -clrButtonGreen = 9900BB00 -clrButtonGreenBorder = FF00BB00 -clrButtonYellow = 99BBBB00 -clrButtonYellowBorder = FFBBBB00 -clrButtonBlue = 990000BB -clrButtonBlueBorder = FF0000BB -clrMessageFont = FFFFFFFF -clrMessageStatus = 900000FF -clrMessageInfo = 90009900 -clrMessageWarning = 90BBBB00 -clrMessageError = 90BB0000 -clrMessageBlend = DD000000 |