diff -Nru kodi-pvr-demo-1.10.7/debian/changelog kodi-pvr-demo-1.11.9/debian/changelog --- kodi-pvr-demo-1.10.7/debian/changelog 2015-07-19 16:49:46.000000000 +0000 +++ kodi-pvr-demo-1.11.9/debian/changelog 2016-01-21 07:56:03.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-pvr-demo (1.10.7-1~trusty) trusty; urgency=low +kodi-pvr-demo (1.11.9-1~trusty) trusty; urgency=low [ kodi ] * autogenerated dummy changelog @@ -6,4 +6,4 @@ [ wsnipex ] * no upstream changelog available - -- wsnipex Sun, 19 Jul 2015 18:49:46 +0200 + -- wsnipex Thu, 21 Jan 2016 08:56:03 +0100 diff -Nru kodi-pvr-demo-1.10.7/debian/changelog.tmp kodi-pvr-demo-1.11.9/debian/changelog.tmp --- kodi-pvr-demo-1.10.7/debian/changelog.tmp 2015-07-19 16:49:08.000000000 +0000 +++ kodi-pvr-demo-1.11.9/debian/changelog.tmp 2016-01-21 07:55:24.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-pvr-demo (1.10.7-1~#DIST#) #DIST#; urgency=low +kodi-pvr-demo (1.11.9-1~#DIST#) #DIST#; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-pvr-demo-1.10.7/pvr.demo/addon.xml kodi-pvr-demo-1.11.9/pvr.demo/addon.xml --- kodi-pvr-demo-1.10.7/pvr.demo/addon.xml 2015-07-17 20:20:46.000000000 +0000 +++ kodi-pvr-demo-1.11.9/pvr.demo/addon.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,190 +0,0 @@ - - - - - - - - - የ PVR ደንበኛ ናሙና - Демонстрация на ПВР клиента - Client Demo PVR - Ukázkový klient PVR - Cleient Recordydd Fideo Personol Arddangos - Demo PVR Klient - Demo PVR Client - Δοκιμαστικός Πελάτης PVR - Demo PVR Client - Demo PVR Client - Demo PVR Client - Demo PVR Client - Cliente PVR demo - Demo Cliente PVR - Cliente Demo PVR - Demo PVR klient - PVR Bezeroaren Demoa - PVR-demoasiakasohjelma - Client numériscope de démo - Client PVR de démonstration - Cliente PVR Demo - דוגמה של לקוח טלוויזיה חיה - Demo PVR klijent - Demo PVR ügyfél - Նախնական PVR բաժանորդ - Klien Demo PVR - Prufu upptökubiðlari - Client PVR Demo - デモ PVR クライアント - 데모 PVR 클라이언트 - Demo PVR klientas - Demo PVR klients - Демо за PVR клиент - Kline PVR Demo - PVR Client သရုပ်ပြမှု့ - Demo PVR-klient - Demo PVR cliënt - Klient TV Demo - Cliente de PVR de Demonstração - Cliente PVR Demo - Demo client PVR - Демонстрация клиента PVR - ආදර්ශක PVR ආයත්තකයා - Demo PVR Klient - Demo odjemalec PVR - Пробни PVR клијент - Пробни PVR клијент - Demo PVR Klient - Dymōnstracyjny klijynt PVR - డెమో PVR క్లయింట్ - Муштарии намоишии PVR - ตัวอย่างลูกข่าย PVR - PVR Tanıtım İstemcisi - Демонстраційний клієнт для PVR - Demo PVR - PVR 演示客户端 - 演示PVR客戶端 - የ PVR ደንበኛ ናሙና - Демонстрация на ПВР клиента - Client Demo PVR - Ukázkový klient PVR - Cleient Recordydd Fideo Personol Arddangos - Demo PVR Klient - Demo PVR Client - Δοκιμαστικός Πελάτης PVR - Demo PVR Client - Demo PVR Client - Demo PVR Client - Demo PVR Client - Cliente PVR demo - Demo Cliente PVR - Cliente Demo PVR - Demo PVR klient - PVR Bezeroaren Demoa - PVR-demoasiakasohjelma - Client numériscope de démo - Client PVR de démonstration - Cliente PVR Demo - דוגמה של לקוח טלוויזיה חיה - Demo PVR klijent - Demo PVR ügyfél - Նախնական PVR բաժանորդ - Demo Klien PVR - Prufu upptökubiðlari - Client PVR Demo - デモ PVR クライアント - 데모 PVR 클라이언트 - Demo PVR klientas - Demo PVR klients - Демо за PVR клиент - Klien PVR Demo - PVR Client သရုပ်ပြမှု့ - Demo PVR-klient - Demo PVR cliënt - Klient TV Demo - Cliente de PVR de Demonstração - Cliente PVR Demo - Demo client PVR - Демонстрация клиента PVR - ආදර්ශක PVR ආයත්තකයා - Demo PVR Klient - Demo odjemalec PVR - Пробни PVR клијент - Пробни PVR клијент - Demo PVR Klient - Dymōnstracyjny klijynt PVR - డెమో PVR క్లయింట్ - Муштарии намоишии PVR - ตัวอย่างลูกข่าย PVR - PVR Tanıtım İstemcisi - Демонстраційний клієнт для PVR - Demo PVR - PVR 演示客户端 - 演示PVR客戶端 - ቁራጭ ይዟል - Просто съдържа междинни файлове - Només conté fragments - Obsahuje pouze pahýly funkcí - Bonion yn unig - Indeholder kun stumper - Enthält nur Fragmente - Περιέχει μόνο εικονικά κανάλια - Just contains stubs - Just contains stubs - Just contains stubs - Just contains stubs - contiene sólo marcadores - Sólo contiene fragmentos - Solo contiene talones - Sisaldab ainult juppe - Puskak ditu soilik - Sisältää vain tyngän - Ne contient que des fragments - Ne contient que des clips - Só contén fragmentos - מכיל רק stubs - Samo sadrži kratke informacije - Csak tesztfunkciókat tartalmaz - Hanya mengandung stub - Inniheldur aðeins búta - Contiene solo tronconi - 単なるスタブです - 단순한 stub만 포함 - Tiesiog tuščia struktūra - Satur tikai nepabeigtas lietas - некакви записи - Hanya mengandungi stub - stub များသာပါဝင်နေခြင်း - Inneholder kun stubber - Bevat enkel stubs - Tylko symuluje działanie - Só contém esboços - Só contém fragmentos - Conține numai cioturi - Содержит заглушки - අක්කඩ පමණක් අන්තර්ගතයි. - Obsahuje len útržky - Vsebuje le fiktivne vsebine - Садржи само назнаке садржаја - Садржи само назнаке садржаја - Innehåller bara stubbar - Ino dymōnstracyjŏ - కేవలం స్టబ్స్ కలిగి ఉంటుంది - Танҳо дорои сарпӯшак мебошад - Sadece taslakları içerir - Не містить нічого - Chỉ chứa phần tử sơ khai - 只包含存根 - 只包含 Stubs - all - - diff -Nru kodi-pvr-demo-1.10.7/pvr.demo/addon.xml.in kodi-pvr-demo-1.11.9/pvr.demo/addon.xml.in --- kodi-pvr-demo-1.10.7/pvr.demo/addon.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ kodi-pvr-demo-1.11.9/pvr.demo/addon.xml.in 2016-01-10 21:41:24.000000000 +0000 @@ -0,0 +1,192 @@ + + + + + + + + + Demo PVR Kliënt + የ PVR ደንበኛ ናሙና + Демонстрационен ПВР клиент + Client Demo PVR + Ukázkový klient PVR + Cleient Recordydd Fideo Personol Arddangos + Demo PVR Klient + Demo PVR Client + Δοκιμαστικός Πελάτης PVR + Demo PVR Client + Demo PVR Client + Demo PVR Client + Demo PVR Client + Cliente PVR demo + Demo Cliente PVR + Cliente Demo PVR + Demo PVR klient + PVR Bezeroaren Demoa + PVR-demoasiakasohjelma + Client de numériscope de démo + Client enregistreur vidéo (PVR) de démonstration + Cliente PVR Demo + דוגמה ללקוח טלוויזיה חיה + Demo PVR klijent + Demo PVR ügyfél + Նախնական PVR բաժանորդ + Klien Demo PVR + Prufu upptökubiðlari + Client PVR Demo + デモ PVR クライアント + 데모 PVR 클라이언트 + Demo PVR klientas + Demo PVR klients + Демо за PVR клиент + Kline PVR Demo + Klijent tal-PVR Tad-Dimostrazzjoni + PVR Client သရုပ်ပြမှု့ + Demo PVR-klient + Demo PVR cliënt + Klient telewizji do celów demonstracyjnych + Cliente de PVR de Demonstração + Cliente PVR Demo + Demo client PVR + Демонстрация клиента PVR + ආදර්ශක PVR ආයත්තකයා + Demo PVR Klient + Demo odjemalec PVR + Пробни PVR Клијент + Probni PVR Кlijent + Demo PVR Klient + Dymōnstracyjny klijynt PVR + డెమో PVR క్లయింట్ + Муштарии намоишии PVR + ตัวอย่างลูกข่าย PVR + PVR Tanıtım İstemcisi + Демонстраційний клієнт для PVR + Demo PVR + PVR 演示客户端 + 演示PVR客戶端 + Demo PVR Kliënt + የ PVR ደንበኛ ናሙና + Демонстрационен ПВР клиент + Client Demo PVR + Ukázkový klient PVR + Cleient Recordydd Fideo Personol Arddangos + Demo PVR Klient + Demo PVR Client + Δοκιμαστικός Πελάτης PVR + Demo PVR Client + Demo PVR Client + Demo PVR Client + Demo PVR Client + Cliente PVR demo + Demo Cliente PVR + Cliente Demo PVR + Demo PVR klient + PVR Bezeroaren Demoa + PVR-demoasiakasohjelma + Client numériscope de démo + Client enregistreur vidéo (PVR) de démonstration + Cliente PVR Demo + דוגמה ללקוח טלוויזיה חיה + Demo PVR klijent + Demo PVR ügyfél + Նախնական PVR բաժանորդ + Demo Klien PVR + Prufu upptökubiðlari + Client PVR Demo + デモ PVR クライアント + 데모 PVR 클라이언트 + Demo PVR klientas + Demo PVR klients + Демо за PVR клиент + Klien PVR Demo + Klijent tal-PVR Tad-Dimostrazzjoni + PVR Client သရုပ်ပြမှု့ + Demo PVR-klient + Demo PVR cliënt + Klient telewizji do celów demonstracyjnych + Cliente de PVR de Demonstração + Cliente PVR Demo + Demo client PVR + Демонстрация клиента PVR + ආදර්ශක PVR ආයත්තකයා + Demo PVR Klient + Demo odjemalec PVR + Пробни PVR Клијент + Probni PVR Кlijent + Demo PVR Klient + Dymōnstracyjny klijynt PVR + డెమో PVR క్లయింట్ + Муштарии намоишии PVR + ตัวอย่างลูกข่าย PVR + PVR Tanıtım İstemcisi + Демонстраційний клієнт для PVR + Demo PVR + PVR 演示客户端 + 演示PVR客戶端 + Bevat net stubs + ቁራጭ ይዟል + Съдържа само stub файлове + Només conté fragments + Obsahuje pouze pahýly funkcí + Bonion yn unig + Indeholder kun stumper + Enthält nur Fragmente + Περιέχει μόνο εικονικά κανάλια + Just contains stubs + Just contains stubs + Just contains stubs + Just contains stubs + contiene sólo marcadores + Sólo contiene fragmentos + Solo contiene talones + Sisaldab ainult juppe + Puskak ditu soilik + Sisältää vain tyngän + Ne contient que des fragments + Ne contient que des clips de démo + Só contén fragmentos + מכיל רק stubs + Samo sadrži kratke informacije + Csak tesztfunkciókat tartalmaz + Hanya mengandung stub + Inniheldur aðeins búta + Contiene solo tronconi + 単なるスタブです + 단순한 stub만 포함 + Tiesiog tuščia struktūra + Satur tikai nepabeigtas lietas + некакви записи + Hanya mengandungi stub + Fih pezzijiet biss + stub များသာပါဝင်နေခြင်း + Inneholder kun stubber + Bevat enkel stubs + Tylko symuluje działanie + Só contém esboços + Só contém fragmentos + Conține numai cioturi + Содержит заглушки + අක්කඩ පමණක් අන්තර්ගතයි. + Obsahuje len útržky + Vsebuje le fiktivne vsebine + Садржи само назнаке садржаја + Sadrži samo naznake sadržaja + Innehåller bara stubbar + Ino dymōnstracyjŏ + కేవలం స్టబ్స్ కలిగి ఉంటుంది + Танҳо дорои сарпӯшак мебошад + Sadece taslakları içerir + Не містить нічого + Chỉ chứa phần tử sơ khai + 只包含存根 + 只包含 Stubs + @PLATFORM@ + + diff -Nru kodi-pvr-demo-1.10.7/pvr.demo/PVRDemoAddonSettings.xml kodi-pvr-demo-1.11.9/pvr.demo/PVRDemoAddonSettings.xml --- kodi-pvr-demo-1.10.7/pvr.demo/PVRDemoAddonSettings.xml 2015-07-17 20:20:46.000000000 +0000 +++ kodi-pvr-demo-1.11.9/pvr.demo/PVRDemoAddonSettings.xml 2016-01-10 21:41:24.000000000 +0000 @@ -1,5 +1,6 @@ + Demo TV Channel 1 0 @@ -89,6 +90,7 @@ http://distribution.bbb3d.renderfarming.net/video/mp4/bbb_sunflower_1080p_30fps_normal.mp4 + Demo Radio Channel 1 1 @@ -169,6 +171,8 @@ special://xbmc/addons/pvr.demo/data/10.png + + Demo TV Channel Sub.1 0 @@ -198,8 +202,16 @@ + + - Demo Group #1 + TV Group #1 0 1 @@ -217,7 +229,7 @@ - Demo Group #2 + TV Group #2 0 3 @@ -230,7 +242,7 @@ - Demo Group #3 + TV Group #3 0 2 @@ -241,6 +253,20 @@ 8 + + + + Radio Group #1 + 1 + + 12 + 13 + 14 + 15 + 16 + 19 + + diff -Nru kodi-pvr-demo-1.10.7/src/client.cpp kodi-pvr-demo-1.11.9/src/client.cpp --- kodi-pvr-demo-1.10.7/src/client.cpp 2015-07-17 20:20:46.000000000 +0000 +++ kodi-pvr-demo-1.11.9/src/client.cpp 2016-01-10 21:41:24.000000000 +0000 @@ -309,6 +309,12 @@ return PVR_ERROR_NOT_IMPLEMENTED; } +PVR_ERROR GetTimerTypes(PVR_TIMER_TYPE types[], int *size) +{ + /* TODO: Implement this to get support for the timer features introduced with PVR API 1.9.7 */ + return PVR_ERROR_NOT_IMPLEMENTED; +} + int GetTimersAmount(void) { if (m_data) @@ -322,6 +328,7 @@ if (m_data) return m_data->GetTimers(handle); + /* TODO: Change implementation to get support for the timer features introduced with PVR API 1.9.7 */ return PVR_ERROR_NOT_IMPLEMENTED; } @@ -363,6 +370,7 @@ bool CanSeekStream(void) { return false; } bool SeekTime(int,bool,double*) { return false; } void SetSpeed(int) {}; +bool IsTimeshifting(void) { return false; } time_t GetPlayingTime() { return 0; } time_t GetBufferTimeStart() { return 0; } time_t GetBufferTimeEnd() { return 0; } diff -Nru kodi-pvr-demo-1.10.7/src/PVRDemoData.cpp kodi-pvr-demo-1.11.9/src/PVRDemoData.cpp --- kodi-pvr-demo-1.10.7/src/PVRDemoData.cpp 2015-07-17 20:20:46.000000000 +0000 +++ kodi-pvr-demo-1.11.9/src/PVRDemoData.cpp 2016-01-10 21:41:24.000000000 +0000 @@ -566,7 +566,8 @@ tag.strIconPath = myTag.strIconPath.c_str(); tag.iGenreType = myTag.iGenreType; tag.iGenreSubType = myTag.iGenreSubType; - + tag.iFlags = EPG_TAG_FLAG_UNDEFINED; + iLastEndTimeTmp = tag.endTime; PVR->TransferEpgEntry(handle, &tag); @@ -622,7 +623,7 @@ PVR_ERROR PVRDemoData::GetTimers(ADDON_HANDLE handle) { - int i = 0; + unsigned int i = PVR_TIMER_NO_CLIENT_INDEX + 1; for (std::vector::iterator it = m_timers.begin() ; it != m_timers.end() ; it++) { PVRDemoTimer &timer = *it; @@ -630,7 +631,10 @@ PVR_TIMER xbmcTimer; memset(&xbmcTimer, 0, sizeof(PVR_TIMER)); - xbmcTimer.iClientIndex = ++i; + /* TODO: Implement own timer types to get support for the timer features introduced with PVR API 1.9.7 */ + xbmcTimer.iTimerType = PVR_TIMER_TYPE_NONE; + + xbmcTimer.iClientIndex = i++; xbmcTimer.iClientChannelUid = timer.iChannelId; xbmcTimer.startTime = timer.startTime; xbmcTimer.endTime = timer.endTime;