diff -Nru vdr-plugin-graphlcd-0.3.0+git20131012-touchcol/debian/changelog vdr-plugin-graphlcd-0.3.0+git20170129/debian/changelog --- vdr-plugin-graphlcd-0.3.0+git20131012-touchcol/debian/changelog 2015-12-22 22:21:40.000000000 +0000 +++ vdr-plugin-graphlcd-0.3.0+git20170129/debian/changelog 2017-03-05 18:10:31.000000000 +0000 @@ -1,14 +1,16 @@ -vdr-plugin-graphlcd (0.3.0+git20131012-touchcol-2yavdr3~trusty) trusty; urgency=medium +vdr-plugin-graphlcd (0.3.0+git20170129-0yavdr0~trusty) trusty; urgency=medium * automatic rebuild - -- yavdr package builder Tue, 22 Dec 2015 23:21:40 +0100 + -- Alexander Grothe Sun, 05 Mar 2017 19:10:31 +0100 -vdr-plugin-graphlcd (0.3.0+git20131012-touchcol-2yavdr3~trusty) trusty; urgency=medium +vdr-plugin-graphlcd (0.3.0+git20170129-0yavdr0~trusty) trusty; urgency=medium - * automatic rebuild + * new upstream snapshot + - adapted to vdr >= 2.3.1 + - using mutex in cGraphLCDDisplay::SetBrightness - -- yavdr package builder Tue, 22 Dec 2015 18:44:17 +0100 + -- Alexander Grothe Sun, 29 Jan 2017 12:27:21 +0100 vdr-plugin-graphlcd (0.3.0+git20131012-touchcol-2yavdr2~trusty) trusty; urgency=medium diff -Nru vdr-plugin-graphlcd-0.3.0+git20131012-touchcol/display.c vdr-plugin-graphlcd-0.3.0+git20170129/display.c --- vdr-plugin-graphlcd-0.3.0+git20131012-touchcol/display.c 2013-01-27 00:50:48.000000000 +0000 +++ vdr-plugin-graphlcd-0.3.0+git20170129/display.c 2017-01-29 01:24:28.000000000 +0000 @@ -492,7 +492,7 @@ void cGraphLCDDisplay::SetBrightness() { - //mutex.Lock(); + mMutex.Lock(); bool bActive = bBrightnessActive || (mState == StateMenu) || (GraphLCDSetup.ShowVolume && mShowVolume) @@ -521,7 +521,7 @@ } } } - //mutex.Unlock(); + mMutex.Unlock(); } void cGraphLCDDisplay::ForceUpdateBrightness() { diff -Nru vdr-plugin-graphlcd-0.3.0+git20131012-touchcol/state.c vdr-plugin-graphlcd-0.3.0+git20170129/state.c --- vdr-plugin-graphlcd-0.3.0+git20131012-touchcol/state.c 2013-01-27 00:50:48.000000000 +0000 +++ vdr-plugin-graphlcd-0.3.0+git20170129/state.c 2017-01-29 01:24:28.000000000 +0000 @@ -675,8 +675,12 @@ } mutex.Lock(); - +#if APIVERSNUM < 20301 cChannel * ch = Channels.GetByNumber(mChannel.number); +#else + LOCK_CHANNELS_READ; + const cChannel * ch = Channels->GetByNumber(mChannel.number); +#endif if (ch) { mChannel.id = ch->GetChannelID(); @@ -713,8 +717,11 @@ { mutex.Lock(); const cEvent * present = NULL, * following = NULL; +#if APIVERSNUM < 20301 cSchedulesLock schedulesLock; - +#else + LOCK_SCHEDULES_READ; +#endif // backup current values std::string currTitle = mPresent.title; std::string currShortText = mPresent.shortText; @@ -737,8 +744,11 @@ mFollowing.title = ""; mFollowing.shortText = ""; mFollowing.description = ""; - +#if APIVERSNUM < 20301 const cSchedules * schedules = cSchedules::Schedules(schedulesLock); +#else + const cSchedules * schedules = Schedules; +#endif if (mChannel.id.Valid()) { if (schedules)