diff --git a/CMakeLists.txt b/CMakeLists.txt index a716941e8..aeb4da0ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -project("Plex Home Theater") +project("OpenPHT") cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR) if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) @@ -27,8 +27,8 @@ else() endif() set(PLEX_VERSION_MAJOR 1) -set(PLEX_VERSION_MINOR 4) -set(PLEX_VERSION_PATCH 2) +set(PLEX_VERSION_MINOR 5) +set(PLEX_VERSION_PATCH 0) if(DEFINED ENV{BUILD_NUMBER}) set(PLEX_VERSION_BUILD "$ENV{BUILD_NUMBER}") set(PLEX_VERSION_BUILD_NR "$ENV{BUILD_NUMBER}") @@ -44,7 +44,7 @@ set(XBMC_VERSION "Frodo") configure_file(${plexdir}/git_revision.h.in git_revision.h) -message(STATUS "Building Plex Home Theater, version: ${PLEX_VERSION_STRING}") +message(STATUS "Building OpenPHT, version: ${PLEX_VERSION_STRING}") include(CMakeFunctions) diff --git a/addons/skin.plex/language/Chinese (Simple)/strings.po b/addons/skin.plex/language/Chinese (Simple)/strings.po index 539f3ec0f..31e91e3ac 100644 --- a/addons/skin.plex/language/Chinese (Simple)/strings.po +++ b/addons/skin.plex/language/Chinese (Simple)/strings.po @@ -1282,7 +1282,7 @@ msgstr "" msgctxt "#32001" -msgid "Plex Home Theater Setup" +msgid "OpenPHT Setup" msgstr "" diff --git a/addons/skin.plex/language/Chinese (Traditional)/strings.po b/addons/skin.plex/language/Chinese (Traditional)/strings.po index 8d1ac9273..fd1c9673c 100644 --- a/addons/skin.plex/language/Chinese (Traditional)/strings.po +++ b/addons/skin.plex/language/Chinese (Traditional)/strings.po @@ -982,7 +982,7 @@ msgid "Please choose the type of audio connector used on this computer. If you' msgstr "" msgctxt "#32001" -msgid "Plex Home Theater Setup" +msgid "OpenPHT Setup" msgstr "" msgctxt "#32003" diff --git a/addons/skin.plex/language/Danish/strings.po b/addons/skin.plex/language/Danish/strings.po index 689c4e2be..169a8f3cf 100644 --- a/addons/skin.plex/language/Danish/strings.po +++ b/addons/skin.plex/language/Danish/strings.po @@ -1282,8 +1282,8 @@ msgstr "Vælg venligst lydforbindelsen for denne computer. Hvis du er usikker, e msgctxt "#32001" -msgid "Plex Home Theater Setup" -msgstr "Plex Home Theater opsætning" +msgid "OpenPHT Setup" +msgstr "OpenPHT opsætning" #empty string with id 32002 diff --git a/addons/skin.plex/language/Dutch/strings.po b/addons/skin.plex/language/Dutch/strings.po index bad434341..004da994f 100644 --- a/addons/skin.plex/language/Dutch/strings.po +++ b/addons/skin.plex/language/Dutch/strings.po @@ -1282,8 +1282,8 @@ msgstr "Kies het type audio verbinding dat je gebruikt op deze computer. Als je msgctxt "#32001" -msgid "Plex Home Theater Setup" -msgstr "Plex Home Theater Setup" +msgid "OpenPHT Setup" +msgstr "OpenPHT Setup" #empty string with id 32002 diff --git a/addons/skin.plex/language/English (US)/strings.po b/addons/skin.plex/language/English (US)/strings.po index c91b4d964..ecbcb403f 100644 --- a/addons/skin.plex/language/English (US)/strings.po +++ b/addons/skin.plex/language/English (US)/strings.po @@ -1282,7 +1282,7 @@ msgstr "" msgctxt "#32001" -msgid "Plex Home Theater Setup" +msgid "OpenPHT Setup" msgstr "" diff --git a/addons/skin.plex/language/English/strings.po b/addons/skin.plex/language/English/strings.po index 4688bcb36..202b0b186 100644 --- a/addons/skin.plex/language/English/strings.po +++ b/addons/skin.plex/language/English/strings.po @@ -1039,7 +1039,7 @@ msgid "Please choose the type of audio connector used on this computer. If you' msgstr "" msgctxt "#32001" -msgid "Plex Home Theater Setup" +msgid "OpenPHT Setup" msgstr "" #empty string with id 32002 diff --git a/addons/skin.plex/language/French/strings.po b/addons/skin.plex/language/French/strings.po index 222e975b0..2ffe9fb7b 100644 --- a/addons/skin.plex/language/French/strings.po +++ b/addons/skin.plex/language/French/strings.po @@ -1282,8 +1282,8 @@ msgstr "S'il vous plaît choisissez le type de connecteur audio utilisé sur cet msgctxt "#32001" -msgid "Plex Home Theater Setup" -msgstr "Installation de Plex Home Theater" +msgid "OpenPHT Setup" +msgstr "Installation de OpenPHT" #empty string with id 32002 diff --git a/addons/skin.plex/language/German/strings.po b/addons/skin.plex/language/German/strings.po index 622419060..e3bab2d2c 100644 --- a/addons/skin.plex/language/German/strings.po +++ b/addons/skin.plex/language/German/strings.po @@ -1282,7 +1282,7 @@ msgstr "" msgctxt "#32001" -msgid "Plex Home Theater Setup" +msgid "OpenPHT Setup" msgstr "" diff --git a/addons/skin.plex/language/Greek/strings.po b/addons/skin.plex/language/Greek/strings.po index bf09df761..5026eb871 100644 --- a/addons/skin.plex/language/Greek/strings.po +++ b/addons/skin.plex/language/Greek/strings.po @@ -1282,7 +1282,7 @@ msgstr "" msgctxt "#32001" -msgid "Plex Home Theater Setup" +msgid "OpenPHT Setup" msgstr "" diff --git a/addons/skin.plex/language/Hebrew/strings.po b/addons/skin.plex/language/Hebrew/strings.po index 37b544313..869d74aae 100644 --- a/addons/skin.plex/language/Hebrew/strings.po +++ b/addons/skin.plex/language/Hebrew/strings.po @@ -1282,7 +1282,7 @@ msgstr "" msgctxt "#32001" -msgid "Plex Home Theater Setup" +msgid "OpenPHT Setup" msgstr "" diff --git a/addons/skin.plex/language/Italian/strings.po b/addons/skin.plex/language/Italian/strings.po index 966bd692e..3be19007c 100644 --- a/addons/skin.plex/language/Italian/strings.po +++ b/addons/skin.plex/language/Italian/strings.po @@ -1282,7 +1282,7 @@ msgstr "" msgctxt "#32001" -msgid "Plex Home Theater Setup" +msgid "OpenPHT Setup" msgstr "" diff --git a/addons/skin.plex/language/Korean/strings.po b/addons/skin.plex/language/Korean/strings.po index ecfb382c1..dea4a1e93 100644 --- a/addons/skin.plex/language/Korean/strings.po +++ b/addons/skin.plex/language/Korean/strings.po @@ -1283,7 +1283,7 @@ msgstr "현제 컴퓨터에서 사용중이 오디오 단자 종류를 선택하 msgctxt "#32001" -msgid "Plex Home Theater Setup" +msgid "OpenPHT Setup" msgstr "플렉스 홈시어터 설정" diff --git a/addons/skin.plex/language/Polish/strings.po b/addons/skin.plex/language/Polish/strings.po index ebe4aa321..03dbb6e4c 100644 --- a/addons/skin.plex/language/Polish/strings.po +++ b/addons/skin.plex/language/Polish/strings.po @@ -1282,7 +1282,7 @@ msgstr "" msgctxt "#32001" -msgid "Plex Home Theater Setup" +msgid "OpenPHT Setup" msgstr "" diff --git a/addons/skin.plex/language/Portuguese (Brazil)/strings.po b/addons/skin.plex/language/Portuguese (Brazil)/strings.po index ec9d6b0a2..a6124da80 100644 --- a/addons/skin.plex/language/Portuguese (Brazil)/strings.po +++ b/addons/skin.plex/language/Portuguese (Brazil)/strings.po @@ -1282,7 +1282,7 @@ msgstr "" msgctxt "#32001" -msgid "Plex Home Theater Setup" +msgid "OpenPHT Setup" msgstr "" diff --git a/addons/skin.plex/language/Portuguese/strings.po b/addons/skin.plex/language/Portuguese/strings.po index 1a790332f..a96aad7d0 100644 --- a/addons/skin.plex/language/Portuguese/strings.po +++ b/addons/skin.plex/language/Portuguese/strings.po @@ -1282,7 +1282,7 @@ msgstr "" msgctxt "#32001" -msgid "Plex Home Theater Setup" +msgid "OpenPHT Setup" msgstr "" diff --git a/addons/skin.plex/language/Spanish/strings.po b/addons/skin.plex/language/Spanish/strings.po index 9bafc5115..e9f5b047f 100644 --- a/addons/skin.plex/language/Spanish/strings.po +++ b/addons/skin.plex/language/Spanish/strings.po @@ -1282,8 +1282,8 @@ msgstr "Por favor, elija el tipo de conexión de audio usada en este ordenador. msgctxt "#32001" -msgid "Plex Home Theater Setup" -msgstr "Configuración de Plex Home Theater" +msgid "OpenPHT Setup" +msgstr "Configuración de OpenPHT" #empty string with id 32002 diff --git a/addons/skin.plex/language/Swedish/strings.po b/addons/skin.plex/language/Swedish/strings.po index 77a035066..c92493439 100644 --- a/addons/skin.plex/language/Swedish/strings.po +++ b/addons/skin.plex/language/Swedish/strings.po @@ -1282,8 +1282,8 @@ msgstr "Vänligen välj den typ av ljudport du använder på denna dator. Om du msgctxt "#32001" -msgid "Plex Home Theater Setup" -msgstr "Plex Home Theater - uppsättning" +msgid "OpenPHT Setup" +msgstr "OpenPHT - uppsättning" #empty string with id 32002 diff --git a/language/Afrikaans_plex/strings.po b/language/Afrikaans_plex/strings.po index b9e3e4e3c..6018c83c0 100644 --- a/language/Afrikaans_plex/strings.po +++ b/language/Afrikaans_plex/strings.po @@ -1173,12 +1173,12 @@ msgstr "" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" diff --git a/language/Chinese (Simple)_plex/strings.po b/language/Chinese (Simple)_plex/strings.po index c606e6409..7be260cf5 100644 --- a/language/Chinese (Simple)_plex/strings.po +++ b/language/Chinese (Simple)_plex/strings.po @@ -1173,13 +1173,13 @@ msgstr "请确认文件存在且必要的驱动器已正确装载" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater 无法播放该该频道的内容" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT 无法播放该该频道的内容" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater 无法播放该该频道的内容" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT 无法播放该该频道的内容" msgctxt "#52100" diff --git a/language/Croatian_plex/strings.po b/language/Croatian_plex/strings.po index 9ce8cd068..48553d7ec 100644 --- a/language/Croatian_plex/strings.po +++ b/language/Croatian_plex/strings.po @@ -1173,12 +1173,12 @@ msgstr "" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" diff --git a/language/Czech_plex/strings.po b/language/Czech_plex/strings.po index 784589243..d0dad45c8 100644 --- a/language/Czech_plex/strings.po +++ b/language/Czech_plex/strings.po @@ -26,7 +26,7 @@ msgstr "Plex/HT SVN" msgctxt "#9" msgid "xbmc media center" -msgstr "Plex Home Theater" +msgstr "OpenPHT" msgctxt "#10" @@ -1173,13 +1173,13 @@ msgstr "Zkontrolujte prosím, zda soubor existuje a potřebný oddíl je připoj msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater nedokáže přehrát obsah tohoto kanálu" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT nedokáže přehrát obsah tohoto kanálu" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater nedokáže přehrát obsah tohoto kanálu" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT nedokáže přehrát obsah tohoto kanálu" msgctxt "#52100" diff --git a/language/Danish_plex/strings.po b/language/Danish_plex/strings.po index 28e024668..db814bbc8 100644 --- a/language/Danish_plex/strings.po +++ b/language/Danish_plex/strings.po @@ -1173,13 +1173,13 @@ msgstr "Venligst kontroller at filen eksisterer samt at der er adgang til drevet msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater kan ikke afspille indholdet af denne kanal" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT kan ikke afspille indholdet af denne kanal" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater kan ikke afspille indholdet af denne kanal" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT kan ikke afspille indholdet af denne kanal" msgctxt "#52100" diff --git a/language/Dutch_plex/strings.po b/language/Dutch_plex/strings.po index 0956c1009..5c5d9f826 100644 --- a/language/Dutch_plex/strings.po +++ b/language/Dutch_plex/strings.po @@ -1173,13 +1173,13 @@ msgstr "Controleer of dit bestand bestaat en of de benodigde schijf beschikbaar msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater is niet in staat de inhoud van dit kanaal af te spelen" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT is niet in staat de inhoud van dit kanaal af te spelen" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater is niet in staat de inhoud van dit kanaal af te spelen" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT is niet in staat de inhoud van dit kanaal af te spelen" msgctxt "#52100" diff --git a/language/English_plex/strings.po b/language/English_plex/strings.po index 20473959d..9a572999a 100644 --- a/language/English_plex/strings.po +++ b/language/English_plex/strings.po @@ -24,7 +24,7 @@ msgstr "Plex/HT Git" msgctxt "#9" msgid "xbmc media center" -msgstr "Plex Home Theater" +msgstr "OpenPHT" msgctxt "#10" msgid "Plex" @@ -456,6 +456,10 @@ msgctxt "#40006" msgid "I am Special!" msgstr "I am Special!" +msgctxt "#40007" +msgid "Preview" +msgstr "Preview" + msgctxt "#40016" msgid "Check for update now..." msgstr "Check for update now..." @@ -965,12 +969,12 @@ msgid "Please check that this file exists and the necessary drive is mounted" msgstr "Please check that this file exists and the necessary drive is mounted" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT is not able to play this channel content" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater is not able to play ISO files" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT is not able to play ISO files" msgctxt "#52100" msgid "Select Audio Track" diff --git a/language/Finnish_plex/strings.po b/language/Finnish_plex/strings.po index 370e43b4a..95f48edf8 100644 --- a/language/Finnish_plex/strings.po +++ b/language/Finnish_plex/strings.po @@ -1173,12 +1173,12 @@ msgstr "" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" diff --git a/language/French_plex/strings.po b/language/French_plex/strings.po index 71ca68912..e0092c7fe 100644 --- a/language/French_plex/strings.po +++ b/language/French_plex/strings.po @@ -1173,13 +1173,13 @@ msgstr "Veuillez vérifier que ce fichier existe et que le disque est monté" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater n'est pas en mesure de jouer ce contenu audio" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT n'est pas en mesure de jouer ce contenu audio" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater n'est pas en mesure de jouer ce contenu audio" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT n'est pas en mesure de jouer ce contenu audio" msgctxt "#52100" diff --git a/language/German_plex/strings.po b/language/German_plex/strings.po index 9b9c1c26c..bed34f5e5 100644 --- a/language/German_plex/strings.po +++ b/language/German_plex/strings.po @@ -26,7 +26,7 @@ msgstr "Plex/HT SVN" msgctxt "#9" msgid "xbmc media center" -msgstr "Plex Home Theater" +msgstr "OpenPHT" msgctxt "#10" @@ -1173,13 +1173,13 @@ msgstr "Bitte überprüfen Sie, ob die Datei vorhanden und das notwendige Laufwe msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater kann den Inhalt dieses Kanals nicht abspielen." +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT kann den Inhalt dieses Kanals nicht abspielen." msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater kann den Inhalt dieses Kanals nicht abspielen." +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT kann den Inhalt dieses Kanals nicht abspielen." msgctxt "#52100" diff --git a/language/Greek_plex/strings.po b/language/Greek_plex/strings.po index a3fbe592b..fd0ac5050 100644 --- a/language/Greek_plex/strings.po +++ b/language/Greek_plex/strings.po @@ -1173,13 +1173,13 @@ msgstr "Παρακαλώ ελέγξτε ότι το αρχείο υπάρχει msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Το Plex Home Theater δεν είναι σε θέση να αναπαράγει το περιεχόμενο αυτού του καναλιού" +msgid "OpenPHT is not able to play this channel content" +msgstr "Το OpenPHT δεν είναι σε θέση να αναπαράγει το περιεχόμενο αυτού του καναλιού" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Το Plex Home Theater δεν είναι σε θέση να αναπαράγει το περιεχόμενο αυτού του καναλιού" +msgid "OpenPHT is not able to play this channel content" +msgstr "Το OpenPHT δεν είναι σε θέση να αναπαράγει το περιεχόμενο αυτού του καναλιού" msgctxt "#52100" diff --git a/language/Hebrew_plex/strings.po b/language/Hebrew_plex/strings.po index e8607494c..64986bf6f 100644 --- a/language/Hebrew_plex/strings.po +++ b/language/Hebrew_plex/strings.po @@ -1173,12 +1173,12 @@ msgstr "" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" diff --git a/language/Icelandic_plex/strings.po b/language/Icelandic_plex/strings.po index aee7a83c5..989a7fec5 100644 --- a/language/Icelandic_plex/strings.po +++ b/language/Icelandic_plex/strings.po @@ -1173,12 +1173,12 @@ msgstr "" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" diff --git a/language/Italian_plex/strings.po b/language/Italian_plex/strings.po index 62c1ac4ac..28128e4f4 100644 --- a/language/Italian_plex/strings.po +++ b/language/Italian_plex/strings.po @@ -1173,12 +1173,12 @@ msgstr "" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" diff --git a/language/Korean_plex/strings.po b/language/Korean_plex/strings.po index df35d5c4e..1731bc5e1 100644 --- a/language/Korean_plex/strings.po +++ b/language/Korean_plex/strings.po @@ -1173,12 +1173,12 @@ msgstr "파일이 존재하거나 필요한 드라이브가 장착되어있는 msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "플렉스 홈 시어터에서 재생 불가능한 채널 컨텐츠 입니다" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "플렉스 홈 시어터에서 재생 불가능한 채널 컨텐츠 입니다" diff --git a/language/Latvian_plex/strings.po b/language/Latvian_plex/strings.po index 370e43b4a..95f48edf8 100644 --- a/language/Latvian_plex/strings.po +++ b/language/Latvian_plex/strings.po @@ -1173,12 +1173,12 @@ msgstr "" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" diff --git a/language/Norwegian_plex/strings.po b/language/Norwegian_plex/strings.po index 4cdca684f..9da8488bb 100644 --- a/language/Norwegian_plex/strings.po +++ b/language/Norwegian_plex/strings.po @@ -26,7 +26,7 @@ msgstr "Plex/HT Git" msgctxt "#9" msgid "xbmc media center" -msgstr "Plex Home Theater" +msgstr "OpenPHT" msgctxt "#10" @@ -1173,13 +1173,13 @@ msgstr "Venligst sjekk om filen eksisterer og om nødvendig disk er koblet til" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater klarer ikke å spille av innholdet på denne kanalen" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT klarer ikke å spille av innholdet på denne kanalen" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater klarer ikke å spille av innholdet på denne kanalen" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT klarer ikke å spille av innholdet på denne kanalen" msgctxt "#52100" diff --git a/language/Polish_plex/strings.po b/language/Polish_plex/strings.po index a36c8953e..422788bb5 100644 --- a/language/Polish_plex/strings.po +++ b/language/Polish_plex/strings.po @@ -1173,13 +1173,13 @@ msgstr "Proszę sprawdzić czy ten plik istnieje i czy odpowiedni napęd jest za msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater nie jest w stanie odtworzyć zawartości tego kanału " +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT nie jest w stanie odtworzyć zawartości tego kanału " msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater nie jest w stanie odtworzyć zawartości tego kanału " +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT nie jest w stanie odtworzyć zawartości tego kanału " msgctxt "#52100" diff --git a/language/Portuguese (Brazil)_plex/strings.po b/language/Portuguese (Brazil)_plex/strings.po index ea33f919d..5aed5ee43 100644 --- a/language/Portuguese (Brazil)_plex/strings.po +++ b/language/Portuguese (Brazil)_plex/strings.po @@ -1173,12 +1173,12 @@ msgstr "" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" diff --git a/language/Portuguese_plex/strings.po b/language/Portuguese_plex/strings.po index 3ee716619..e41571ff9 100644 --- a/language/Portuguese_plex/strings.po +++ b/language/Portuguese_plex/strings.po @@ -1173,12 +1173,12 @@ msgstr "" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" diff --git a/language/Russian_plex/strings.po b/language/Russian_plex/strings.po index c5d0d2df2..dd13dab0c 100644 --- a/language/Russian_plex/strings.po +++ b/language/Russian_plex/strings.po @@ -1173,13 +1173,13 @@ msgstr "Пожалуйста, проверьте, что данный файл msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater не может воспроизвести данные с этого канала" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT не может воспроизвести данные с этого канала" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater не может воспроизвести данные с этого канала" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT не может воспроизвести данные с этого канала" msgctxt "#52100" diff --git a/language/Serbian_plex/strings.po b/language/Serbian_plex/strings.po index 681e6e187..ccacba379 100644 --- a/language/Serbian_plex/strings.po +++ b/language/Serbian_plex/strings.po @@ -1173,13 +1173,13 @@ msgstr "Молимо вас да проверите да ли та датоте msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater не може да репродукује садржај из овог канала" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT не може да репродукује садржај из овог канала" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater не може да репродукује садржај из овог канала" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT не може да репродукује садржај из овог канала" msgctxt "#52100" diff --git a/language/Spanish (Argentina)_plex/strings.po b/language/Spanish (Argentina)_plex/strings.po index 3195e9fc2..468d79af9 100644 --- a/language/Spanish (Argentina)_plex/strings.po +++ b/language/Spanish (Argentina)_plex/strings.po @@ -1173,12 +1173,12 @@ msgstr "" msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" +msgid "OpenPHT is not able to play this channel content" msgstr "" diff --git a/language/Spanish_plex/strings.po b/language/Spanish_plex/strings.po index a8e35c2e1..24b85cf0e 100644 --- a/language/Spanish_plex/strings.po +++ b/language/Spanish_plex/strings.po @@ -26,7 +26,7 @@ msgstr "Plex/HT SVN" msgctxt "#9" msgid "xbmc media center" -msgstr "Plex Home Theater" +msgstr "OpenPHT" msgctxt "#10" @@ -1173,13 +1173,13 @@ msgstr "Por favor, comprobar que el fichero exista y la unidad necesaria esté m msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater no es capaz de reproducir el contenido de este canal" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT no es capaz de reproducir el contenido de este canal" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater no es capaz de reproducir el contenido de este canal" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT no es capaz de reproducir el contenido de este canal" msgctxt "#52100" diff --git a/language/Swedish_plex/strings.po b/language/Swedish_plex/strings.po index 9c8e1cd6c..3fa083a7f 100644 --- a/language/Swedish_plex/strings.po +++ b/language/Swedish_plex/strings.po @@ -1173,13 +1173,13 @@ msgstr "Kontrollera att denna fil existerar på samma sökväg som då den inska msgctxt "#52011" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater kan ej spela upp denna kanalens innehåll" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT kan ej spela upp denna kanalens innehåll" msgctxt "#52012" -msgid "Plex Home Theater is not able to play this channel content" -msgstr "Plex Home Theater kan ej spela upp denna kanalens innehåll" +msgid "OpenPHT is not able to play this channel content" +msgstr "OpenPHT kan ej spela upp denna kanalens innehåll" msgctxt "#52100" diff --git a/plex/AutoUpdate/PlexAutoUpdate.cpp b/plex/AutoUpdate/PlexAutoUpdate.cpp index 596f0780a..1af4be18c 100755 --- a/plex/AutoUpdate/PlexAutoUpdate.cpp +++ b/plex/AutoUpdate/PlexAutoUpdate.cpp @@ -44,7 +44,7 @@ CPlexAutoUpdate::CPlexAutoUpdate() else m_url = CURL("https://raw.github.com/RasPlex/RasPlex.github.io/master/autoupdate/stable.xml"); #else - m_url = CURL("https://plex.tv/updater/products/2/check.xml"); + m_url = CURL("http://services.openpht.tv/updater/check.xml"); #endif m_searchFrequency = 21600000; /* 6 hours */ @@ -112,8 +112,8 @@ void CPlexAutoUpdate::OnTimeout() if (channel != CMyPlexUserInfo::ROLE_USER) m_url.SetOption("channel", boost::lexical_cast(channel)); - if (g_plexApplication.myPlexManager->IsSignedIn()) - m_url.SetOption("X-Plex-Token", g_plexApplication.myPlexManager->GetAuthToken()); + //if (g_plexApplication.myPlexManager->IsSignedIn()) + // m_url.SetOption("X-Plex-Token", g_plexApplication.myPlexManager->GetAuthToken()); std::vector alreadyTriedVersion = GetAllInstalledVersions(); CFileItemList updates; diff --git a/plex/CMakeCompleteBundle.cmake.in b/plex/CMakeCompleteBundle.cmake.in index c5041d24b..09c817d99 100644 --- a/plex/CMakeCompleteBundle.cmake.in +++ b/plex/CMakeCompleteBundle.cmake.in @@ -50,14 +50,14 @@ if(NOT TARGET_WIN32) file(GLOB_RECURSE DYLIBS ${CMAKE_INSTALL_PREFIX}/*.dylib) foreach(LIB ${DYLIBS}) message("Signing: ${LIB}") - execute_process(COMMAND codesign --force --sign "Developer ID Application: Plex Inc." "${LIB}") + execute_process(COMMAND codesign --force --sign "Developer ID Application" "${LIB}") endforeach(LIB ${DYLIBS}) message("Signing binary: ${EXECUTABLE_NAME}.app/Contents/Resources/XBMC/tools/updater") - execute_process(COMMAND codesign --force --sign "Developer ID Application: Plex Inc." "${CMAKE_INSTALL_PREFIX}/${EXECUTABLE_NAME}.app/Contents/Resources/XBMC/tools/updater") + execute_process(COMMAND codesign --force --sign "Developer ID Application" "${CMAKE_INSTALL_PREFIX}/${EXECUTABLE_NAME}.app/Contents/Resources/XBMC/tools/updater") message("Signing binary: ${EXECUTABLE_NAME}.app") - execute_process(COMMAND codesign --force --sign "Developer ID Application: Plex Inc." -r ${PLEXDIR}/Resources/requirement.bin "${CMAKE_INSTALL_PREFIX}/${EXECUTABLE_NAME}.app") + execute_process(COMMAND codesign --force --sign "Developer ID Application" -r ${PLEXDIR}/Resources/requirement.bin "${CMAKE_INSTALL_PREFIX}/${EXECUTABLE_NAME}.app") message("Verifing signature") execute_process(COMMAND codesign --verbose=4 --verify "${CMAKE_INSTALL_PREFIX}/${EXECUTABLE_NAME}.app") @@ -68,8 +68,11 @@ else(NOT TARGET_WIN32) file(GLOB_RECURSE EXES ${CMAKE_INSTALL_PREFIX}/*.exe) set(ENV{errorlevel} 1) foreach(e ${EXES}) - message("-- Signing: ${PLEXDIR}/scripts/WindowsSign.cmd ${e}") - execute_process(COMMAND ${PLEXDIR}/scripts/WindowsSign.cmd "${e}" RESULT_VARIABLE RES) + string(FIND ${e} "/Dependencies/" EXCLUDE_DIR_FOUND) + if(${EXCLUDE_DIR_FOUND} EQUAL -1) + message("-- Signing: ${PLEXDIR}/scripts/WindowsSign.cmd ${e}") + execute_process(COMMAND ${PLEXDIR}/scripts/WindowsSign.cmd "${e}" RESULT_VARIABLE RES) + endif() endforeach(e ${EXES}) endif(NOT TARGET_WIN32) diff --git a/plex/CMakeLists.txt b/plex/CMakeLists.txt index 17a8f34b9..57409b66e 100644 --- a/plex/CMakeLists.txt +++ b/plex/CMakeLists.txt @@ -166,7 +166,7 @@ endif() # Set the correct binary name set_target_properties(${PLEX_TARGET_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_NAME}) -set_target_properties(${PLEX_TARGET_NAME} PROPERTIES PDB_NAME "Plex Home Theater") +set_target_properties(${PLEX_TARGET_NAME} PROPERTIES PDB_NAME "OpenPHT") if(TARGET_POSIX) # Allow shared libraries to call plexhometheater functions diff --git a/plex/CMakeModules/BreakpadSymbols.cmake b/plex/CMakeModules/BreakpadSymbols.cmake index 72947e508..169221093 100644 --- a/plex/CMakeModules/BreakpadSymbols.cmake +++ b/plex/CMakeModules/BreakpadSymbols.cmake @@ -3,11 +3,11 @@ find_program(BZIP2 bzip2 HINTS /usr/bin) function(GENERATE_DSYMS TGT) get_target_property(TARGET_FNAME ${TGT} OUTPUT_NAME) add_custom_command( - OUTPUT "Plex Home Theater.dSYM/Contents/Resources/DWARF/Plex Home Theater" + OUTPUT "${TARGET_FNAME}.dSYM" COMMAND dsymutil -o "${TARGET_FNAME}.dSYM" "$" DEPENDS ${TGT} ) - add_custom_target(${TGT}_dsym ALL DEPENDS "Plex Home Theater.dSYM/Contents/Resources/DWARF/Plex Home Theater") + add_custom_target(${TGT}_dsym ALL DEPENDS "${TARGET_FNAME}.dSYM") endfunction(GENERATE_DSYMS APP) function(GENERATE_BREAKPAD_SYMBOLS APP) @@ -42,11 +42,11 @@ function(GENERATE_BREAKPAD_SYMBOLS APP) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/symserv) add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/PlexHomeTheater-${PLEX_VERSION_STRING}.symsrv.zip + OUTPUT ${CMAKE_BINARY_DIR}/OpenPHT-${PLEX_VERSION_STRING}.symsrv.zip COMMAND ${PROJECT_SOURCE_DIR}/plex/scripts/create_symstore.cmd "${PROJECT_SOURCE_DIR}" "${PLEX_VERSION_STRING}" DEPENDS ${DEPENDENCY} WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) - add_custom_target(${APP}_symbols DEPENDS ${CMAKE_BINARY_DIR}/${APP}-${PLEX_VERSION_STRING}.symbols.7z ${CMAKE_BINARY_DIR}/PlexHomeTheater-${PLEX_VERSION_STRING}.symsrv.zip) + add_custom_target(${APP}_symbols DEPENDS ${CMAKE_BINARY_DIR}/${APP}-${PLEX_VERSION_STRING}.symbols.7z ${CMAKE_BINARY_DIR}/OpenPHT-${PLEX_VERSION_STRING}.symsrv.zip) endif(NOT TARGET_WIN32) endfunction(GENERATE_BREAKPAD_SYMBOLS APP) diff --git a/plex/CMakeModules/CMakeConfig.cmake b/plex/CMakeModules/CMakeConfig.cmake index 791b62122..e8b726418 100644 --- a/plex/CMakeModules/CMakeConfig.cmake +++ b/plex/CMakeModules/CMakeConfig.cmake @@ -4,7 +4,7 @@ if(NOT WIN32) include(CheckSystemFunctions) endif(NOT WIN32) -set(PLEX_TARGET_NAME PlexHomeTheater) +set(PLEX_TARGET_NAME OpenPHT) set(CONFIG_INTERNAL_LIBS lib_hts diff --git a/plex/CMakeModules/CPackConfig.cmake b/plex/CMakeModules/CPackConfig.cmake index 0fd9583f6..5e6d44137 100644 --- a/plex/CMakeModules/CPackConfig.cmake +++ b/plex/CMakeModules/CPackConfig.cmake @@ -1,5 +1,5 @@ -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Plex for Home Theater") -set(CPACK_PACKAGE_VENDOR "Plex inc") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenPHT") +set(CPACK_PACKAGE_VENDOR "Team OpenPHT") set(CPACK_PACKAGE_VERSION_MAJOR ${PLEX_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${PLEX_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${PLEX_VERSION_PATCH}) @@ -15,11 +15,11 @@ endif() set(CPACK_PACKAGE_FILE_NAME "${PLEX_TARGET_NAME}-${PLEX_VERSION_STRING}-${CPACK_SYSTEM_NAME}") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PLEX_TARGET_NAME}-${PLEX_VERSION_STRING}-src") -set(CPACK_PACKAGE_INSTALL_DIRECTORY "Plex Home Theater") +set(CPACK_PACKAGE_INSTALL_DIRECTORY "OpenPHT") set(CPACK_COMPONENT_QDXSETUP_DISPLAY_NAME "DirectX Installer") set(CPACK_COMPONENT_VCREDIST_DISPLAY_NAME "Visual Studio redistribution installer") set(CPACK_COMPONENT_MCE_DISPLAY_NAME "Microsoft Media Center Integration") -set(CPACK_COMPONENT_RUNTIME_DISPLAY_NAME "Plex for Home Theater") +set(CPACK_COMPONENT_RUNTIME_DISPLAY_NAME "OpenPHT") set(CPACK_COMPONENT_RUNTIME_REQUIRED 1) set(CPACK_STRIP_FILES 1) @@ -27,9 +27,9 @@ set(CPACK_STRIP_FILES 1) set(CPACK_NSIS_MUI_UNIICON ${plexdir}\\\\Resources\\\\Plex.ico) set(CPACK_NSIS_MUI_ICON ${plexdir}\\\\Resources\\\\Plex.ico) #set(CPACK_PACKAGE_ICON ${plexdir}\\\\Resources\\\\PlexBanner.bmp) -set(CPACK_NSIS_HELP_LINK "http://plexapp.com") +set(CPACK_NSIS_HELP_LINK "http://www.openpht.tv") set(CPACK_NSIS_URL_INFO_ABOUT ${CPACK_NSIS_HELP_LINK}) -set(CPACK_PACKAGE_EXECUTABLES ${EXECUTABLE_NAME} "Plex for Home Theater" ${CPACK_PACKAGE_EXECUTABLES}) +set(CPACK_PACKAGE_EXECUTABLES ${EXECUTABLE_NAME} "OpenPHT" ${CPACK_PACKAGE_EXECUTABLES}) set(CPACK_RESOURCE_FILE_LICENSE ${root}/LICENSE.GPL) set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".") @@ -61,21 +61,21 @@ set(CPACK_SOURCE_IGNORE_FILES "^${PROJECT_SOURCE_DIR}/upload" ) -set(ZIPFILE PlexHomeTheater-${PLEX_VERSION_STRING}-${CPACK_SYSTEM_NAME}.zip) +set(ZIPFILE OpenPHT-${PLEX_VERSION_STRING}-${CPACK_SYSTEM_NAME}.zip) if(TARGET_WIN32) - set(ZIPFILE ${CPACK_PACKAGE_DIRECTORY}/PlexHomeTheater-${PLEX_VERSION_STRING}-${CPACK_SYSTEM_NAME}.zip) - set(MAIN_BINARY "-m \"Plex Home Theater.exe\"") + set(ZIPFILE ${CPACK_PACKAGE_DIRECTORY}/OpenPHT-${PLEX_VERSION_STRING}-${CPACK_SYSTEM_NAME}.zip) + set(MAIN_BINARY "-m \"OpenPHT.exe\"") endif(TARGET_WIN32) if(PYTHONINTERP_FOUND) add_custom_command( - OUTPUT PlexHomeTheater-${PLEX_VERSION_STRING}-${CPACK_SYSTEM_NAME}-manifest.xml + OUTPUT OpenPHT-${PLEX_VERSION_STRING}-${CPACK_SYSTEM_NAME}-manifest.xml COMMAND ${PYTHON_EXECUTABLE} ${plexdir}/scripts/create_update.py -p ${CPACK_SYSTEM_NAME} ${MAIN_BINARY} -v ${PLEX_VERSION_STRING} -i ${ZIPFILE} -o ${CMAKE_BINARY_DIR} DEPENDS package ) - add_custom_target(update_manifest DEPENDS PlexHomeTheater-${PLEX_VERSION_STRING}-${CPACK_SYSTEM_NAME}-manifest.xml) + add_custom_target(update_manifest DEPENDS OpenPHT-${PLEX_VERSION_STRING}-${CPACK_SYSTEM_NAME}-manifest.xml) set(PKG update_manifest) endif(PYTHONINTERP_FOUND) diff --git a/plex/CMakeModules/NSIS.template.in b/plex/CMakeModules/NSIS.template.in index 12e58664d..c201a128d 100644 --- a/plex/CMakeModules/NSIS.template.in +++ b/plex/CMakeModules/NSIS.template.in @@ -1016,7 +1016,7 @@ inst: FunctionEnd ; MCE Stuff -Section "Media Center Launcher for PlexHT" SecMCE +Section "Media Center Launcher for OpenPHT" SecMCE SectionIn 1 #section is in installtype Full, not minimal @@ -1037,7 +1037,7 @@ Section "Media Center Launcher for PlexHT" SecMCE ${EndIf} SectionEnd -Section "Un.Media Center Launcher for PlexHT" UnSecMCE +Section "Un.Media Center Launcher for OpenPHT" UnSecMCE ${If} $SupportedMCEDetected == "1" DetailPrint "Running $WINDIR\eHome\RegisterMCEApp.exe /allusers /u $INSTDIR\$MCERegistrationFile" StrCpy $0 "?" diff --git a/plex/CMakeModules/PlatformConfigOSX.cmake b/plex/CMakeModules/PlatformConfigOSX.cmake index c82c2c4e8..3e008af0f 100644 --- a/plex/CMakeModules/PlatformConfigOSX.cmake +++ b/plex/CMakeModules/PlatformConfigOSX.cmake @@ -159,7 +159,7 @@ foreach(lib ${osx_frameworks}) endforeach() #### Deal with some generated files -set(EXECUTABLE_NAME "Plex Home Theater") +set(EXECUTABLE_NAME "OpenPHT") set(ARCH "x86-osx") diff --git a/plex/CMakeModules/PlatformConfigWIN32.cmake b/plex/CMakeModules/PlatformConfigWIN32.cmake index d2c075e76..8f6cbd052 100644 --- a/plex/CMakeModules/PlatformConfigWIN32.cmake +++ b/plex/CMakeModules/PlatformConfigWIN32.cmake @@ -86,7 +86,7 @@ endforeach() set(CONFIG_LIBRARY_OPENGL ${CONFIG_LIBRARY_OPENGL32} ${CONFIG_LIBRARY_GLU32}) set(ARCH "x86-win") -set(EXECUTABLE_NAME "Plex Home Theater") +set(EXECUTABLE_NAME "OpenPHT") set(FFMPEG_INCLUDE_DIRS ${dependdir}/include) set(LIBPATH .) set(BINPATH .) diff --git a/plex/Client/PlexMediaServerClient.cpp b/plex/Client/PlexMediaServerClient.cpp index 29da60b12..a27941e51 100644 --- a/plex/Client/PlexMediaServerClient.cpp +++ b/plex/Client/PlexMediaServerClient.cpp @@ -139,7 +139,7 @@ void CPlexMediaServerClient::publishDevice() CLog::Log(LOGDEBUG, "CPlexMediaServerClient::publishDevice Adding interface: %s for publishing", deviceAddr.Get().c_str()); CStdString opt; - opt.Format("%s=%s", CURL::Encode("Connection[][uri]"), CURL::Encode(deviceAddr.Get())); + opt.Format("%s=%s", CURL::Encode("Connection[][uri]"), CURL::Encode(deviceAddr.Get().TrimRight("/").c_str())); interfaceOptions.push_back(opt); } diff --git a/plex/FileSystem/PlexFile.cpp b/plex/FileSystem/PlexFile.cpp index b3a53dc01..8e45c56ed 100644 --- a/plex/FileSystem/PlexFile.cpp +++ b/plex/FileSystem/PlexFile.cpp @@ -26,7 +26,7 @@ vector CPlexFile::GetHeaderList() hdrs.push_back(stringPair("X-Plex-Version", g_infoManager.GetVersion())); hdrs.push_back(stringPair("X-Plex-Client-Identifier", g_guiSettings.GetString("system.uuid"))); hdrs.push_back(stringPair("X-Plex-Provides", "player")); - hdrs.push_back(stringPair("X-Plex-Product", "Plex Home Theater")); + hdrs.push_back(stringPair("X-Plex-Product", "OpenPHT")); hdrs.push_back(stringPair("X-Plex-Device-Name", g_guiSettings.GetString("services.devicename"))); hdrs.push_back(stringPair("X-Plex-Platform", "Plex Home Theater")); hdrs.push_back(stringPair("X-Plex-Model", PlexUtils::GetMachinePlatform())); diff --git a/plex/Network/PlexNetworkServiceAdvertiser.h b/plex/Network/PlexNetworkServiceAdvertiser.h index 9e4d7209a..02ae666f7 100644 --- a/plex/Network/PlexNetworkServiceAdvertiser.h +++ b/plex/Network/PlexNetworkServiceAdvertiser.h @@ -33,7 +33,7 @@ class PlexNetworkServiceAdvertiser : public NetworkServiceAdvertiser headers["Protocol"] = "plex"; headers["Protocol-Version"] = "1"; headers["Protocol-Capabilities"] = PLEX_HOME_THEATER_CAPABILITY_STRING; - headers["Device-Class"] = "HTPC"; + headers["Device-Class"] = "pc"; } /// For subclasses to fill in. diff --git a/plex/Owned/GUISettings.cpp b/plex/Owned/GUISettings.cpp index b53abdf36..c3af8be3d 100644 --- a/plex/Owned/GUISettings.cpp +++ b/plex/Owned/GUISettings.cpp @@ -583,8 +583,8 @@ void CGUISettings::Initialize() AddString(advs, "advanced.labeldebug", 18112, "", BUTTON_CONTROL_STANDARD); AddBool(advs, "debug.showloginfo", 20191, false); - AddBool(advs, "debug.networklogging", 52404, false); - AddBool(advs, "advanced.collectanalytics", 52504, true); + AddBool(NULL, "debug.networklogging", 52404, false); + AddBool(NULL, "advanced.collectanalytics", 52504, false); AddPath(NULL, "debug.screenshotpath",20004,"select writable folder",BUTTON_CONTROL_PATH_INPUT,false,657); // Unused/hidden network settings diff --git a/plex/PlexAnalytics.cpp b/plex/PlexAnalytics.cpp index dbf17f31f..fd5433e99 100644 --- a/plex/PlexAnalytics.cpp +++ b/plex/PlexAnalytics.cpp @@ -43,7 +43,7 @@ CPlexAnalytics::CPlexAnalytics() : m_firstEvent(true), m_numberOfPlays(0) m_baseOptions.AddOption("v", "1"); m_baseOptions.AddOption("tid", ANALYTICS_TID_PHT); m_baseOptions.AddOption("ul", g_guiSettings.GetString("locale.language")); - m_baseOptions.AddOption("an", "Plex Home Theater"); + m_baseOptions.AddOption("an", "OpenPHT"); m_baseOptions.AddOption("av", g_infoManager.GetVersion()); m_baseOptions.AddOption("cid", g_guiSettings.GetString("system.uuid")); @@ -125,7 +125,7 @@ void CPlexAnalytics::setCustomDimensions(CUrlOptions &options) /////////////////////////////////////////////////////////////////////////////////////////////////// void CPlexAnalytics::trackEvent(const std::string &category, const std::string &action, const std::string &label, int64_t value, const CUrlOptions &args) { - if (!g_guiSettings.GetBool("advanced.collectanalytics")) + //if (!g_guiSettings.GetBool("advanced.collectanalytics")) return; CUrlOptions opts(m_baseOptions); @@ -155,7 +155,7 @@ void CPlexAnalytics::sendPing() /////////////////////////////////////////////////////////////////////////////////////////////////// void CPlexAnalytics::sendTrackingRequest(const CUrlOptions &request) { - if (!g_guiSettings.GetBool("advanced.collectanalytics")) + //if (!g_guiSettings.GetBool("advanced.collectanalytics")) return; CURL u("http://www.google-analytics.com/collect"); @@ -190,7 +190,7 @@ void CPlexAnalytics::sendPlaybackStop() /////////////////////////////////////////////////////////////////////////////////////////////////// void CPlexAnalytics::Announce(ANNOUNCEMENT::AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data) { - if (!g_guiSettings.GetBool("advanced.collectanalytics")) + //if (!g_guiSettings.GetBool("advanced.collectanalytics")) return; if (flag == ANNOUNCEMENT::System && (stricmp(sender, "xbmc") == 0)) diff --git a/plex/PlexApplication.cpp b/plex/PlexApplication.cpp index dc63cda0f..c125aa6a2 100644 --- a/plex/PlexApplication.cpp +++ b/plex/PlexApplication.cpp @@ -101,8 +101,8 @@ void PlexApplication::Start() } } - if (g_guiSettings.GetBool("advanced.collectanalytics")) - analytics->startLogging(); + //if (g_guiSettings.GetBool("advanced.collectanalytics")) + // analytics->startLogging(); myPlexManager->Create(); } @@ -185,7 +185,7 @@ void PlexApplication::setNetworkLogging(bool onOff) timer->SetTimeout(1200000, this); m_networkLoggingOn = true; - CLog::Log(LOGINFO, "Plex Home Theater v%s (%s %s) @ %s", g_infoManager.GetVersion().c_str(), + CLog::Log(LOGINFO, "OpenPHT v%s (%s %s) @ %s", g_infoManager.GetVersion().c_str(), PlexUtils::GetMachinePlatform().c_str(), PlexUtils::GetMachinePlatformVersion().c_str(), myPlexManager->GetCurrentUserInfo().email.c_str()); @@ -245,7 +245,7 @@ void PlexApplication::sendNetworkLog(int level, const std::string& logline) std::stringstream s; s << "<" << priority << ">" + std::string(time) << " x " - << "Plex Home Theater: "; + << "OpenPHT: "; s << "[" << myPlexManager->GetCurrentUserInfo().email << "] "; int strleft = 1024 - s.str().size(); diff --git a/plex/ReleaseNotes/1.4.2.txt b/plex/ReleaseNotes/1.5.0.txt similarity index 100% rename from plex/ReleaseNotes/1.4.2.txt rename to plex/ReleaseNotes/1.5.0.txt diff --git a/plex/Remote/PlexHTTPRemoteHandler.cpp b/plex/Remote/PlexHTTPRemoteHandler.cpp index 1f4bd79a8..d91265931 100644 --- a/plex/Remote/PlexHTTPRemoteHandler.cpp +++ b/plex/Remote/PlexHTTPRemoteHandler.cpp @@ -17,6 +17,7 @@ #include "GUIUserMessages.h" #include "guilib/GUIWindowManager.h" #include "dialogs/GUIDialogKeyboardGeneric.h" +#include "GUIInfoManager.h" #include "utils/log.h" #include "interfaces/Builtins.h" @@ -444,14 +445,15 @@ CPlexRemoteResponse CPlexHTTPRemoteHandler::resources() // title="My Nexus 7" machineIdentifier="x" product="p" platform="p" platformVersion="v" protocolVersion="x" protocolCapabilities="y" deviceClass="z" TiXmlElement *player = new TiXmlElement("Player"); player->SetAttribute("title", g_guiSettings.GetString("services.devicename").c_str()); - player->SetAttribute("protocol", "plex"); - player->SetAttribute("protocolVersion", "1"); - player->SetAttribute("protocolCapabilities", PLEX_HOME_THEATER_CAPABILITY_STRING); player->SetAttribute("machineIdentifier", g_guiSettings.GetString("system.uuid").c_str()); - player->SetAttribute("product", "Plex Home Theater"); + player->SetAttribute("product", "OpenPHT"); + player->SetAttribute("version", g_infoManager.GetVersion().c_str()); player->SetAttribute("platform", PlexUtils::GetMachinePlatform()); player->SetAttribute("platformVersion", PlexUtils::GetMachinePlatformVersion()); player->SetAttribute("deviceClass", "pc"); + player->SetAttribute("protocol", "plex"); + player->SetAttribute("protocolVersion", "1"); + player->SetAttribute("protocolCapabilities", PLEX_HOME_THEATER_CAPABILITY_STRING); mediaContainer->LinkEndChild(player); diff --git a/plex/Resources/Info.plist.in b/plex/Resources/Info.plist.in index dd6153b91..f1a34a5ae 100644 --- a/plex/Resources/Info.plist.in +++ b/plex/Resources/Info.plist.in @@ -5,13 +5,13 @@ CFBundleDevelopmentRegion English CFBundleExecutable - Plex Home Theater + OpenPHT CFBundleGetInfoString - Plex Home Theater + OpenPHT CFBundleIconFile Plex.icns CFBundleIdentifier - com.plexapp.plexhometheater + tv.openpht.openpht CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString diff --git a/plex/Resources/MCE/plex-mce-registration-7.xml b/plex/Resources/MCE/plex-mce-registration-7.xml index 40d403426..138d15d42 100644 --- a/plex/Resources/MCE/plex-mce-registration-7.xml +++ b/plex/Resources/MCE/plex-mce-registration-7.xml @@ -1,14 +1,14 @@ - + StartMenuStripTitle="OpenPHT" + StartMenuStripCategory="Custom Start Menu\OpenPHT"> - - - + diff --git a/plex/Resources/MCE/plex-mce-registration-vista.xml b/plex/Resources/MCE/plex-mce-registration-vista.xml index 896040c76..6c4f79ef6 100644 --- a/plex/Resources/MCE/plex-mce-registration-vista.xml +++ b/plex/Resources/MCE/plex-mce-registration-vista.xml @@ -1,14 +1,14 @@ - + StartMenuStripTitle="OpenPHT" + StartMenuStripCategory="Custom Start Menu\OpenPHT"> - - - + diff --git a/plex/Resources/MCE/plex-mce-registration-xp.mcl b/plex/Resources/MCE/plex-mce-registration-xp.mcl index 8d04741ce..9cad91835 100644 --- a/plex/Resources/MCE/plex-mce-registration-xp.mcl +++ b/plex/Resources/MCE/plex-mce-registration-xp.mcl @@ -1,6 +1,6 @@ - \ No newline at end of file + startImage="C:\Program Files\OpenPHT\plex-mce-icon-square.png" + companyname="Team OpenPHT" + description="OpenPHT for Windows" /> \ No newline at end of file diff --git a/plex/Resources/MCE/plex-mce-registration-xp.xml b/plex/Resources/MCE/plex-mce-registration-xp.xml index ce84a529d..6c56639b9 100644 --- a/plex/Resources/MCE/plex-mce-registration-xp.xml +++ b/plex/Resources/MCE/plex-mce-registration-xp.xml @@ -1,12 +1,12 @@ - - - + diff --git a/plex/Update-Installer/CMakeLists.txt b/plex/Update-Installer/CMakeLists.txt index 62297c85d..db04f5ef4 100644 --- a/plex/Update-Installer/CMakeLists.txt +++ b/plex/Update-Installer/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories(external/sha1 external/bsdiff) ## PLEX if(NOT APPNAME) - set(APPNAME "Plex Home Theater") + set(APPNAME "OpenPHT") endif(NOT APPNAME) add_definitions(-DAPPNAME="${APPNAME}") @@ -32,7 +32,7 @@ endif(DISABLE_GUI) ## PLEX if(NOT APPNAME) - set(APPNAME "Plex Home Theater") + set(APPNAME "OpenPHT") endif(NOT APPNAME) add_definitions(-DAPPNAME="${APPNAME}") diff --git a/plex/Update-Installer/manifest-tools/create_manifest.py b/plex/Update-Installer/manifest-tools/create_manifest.py index bcf791553..a444eec91 100755 --- a/plex/Update-Installer/manifest-tools/create_manifest.py +++ b/plex/Update-Installer/manifest-tools/create_manifest.py @@ -9,12 +9,12 @@ if __name__ == "__main__": o = optparse.OptionParser() - o.add_option("-r", dest="product", default="PlexHomeTheater", type="string") + o.add_option("-r", dest="product", default="OpenPHT", type="string") o.add_option('-v', dest="version", default="NOVERSION", type="string") o.add_option("-o", dest="output", default=".", type="string") o.add_option("-p", dest="platform", default=platform.system().lower(), type="string") o.add_option("-f", dest="fromversion", default="", type="string") - o.add_option("-m", dest="mainbinary", default="Contents/MacOS/Plex Home Theater", type="string") + o.add_option("-m", dest="mainbinary", default="Contents/MacOS/OpenPHT", type="string") o.add_option("-e", dest="exclude", default="", type="string") (options, args) = o.parse_args() diff --git a/plex/Update-Installer/src/AppInfo.cpp b/plex/Update-Installer/src/AppInfo.cpp index d0d7908e6..1fbedc675 100644 --- a/plex/Update-Installer/src/AppInfo.cpp +++ b/plex/Update-Installer/src/AppInfo.cpp @@ -17,6 +17,6 @@ std::string AppInfo::updateErrorMessage(const std::string& details) std::string result = "There was a problem installing the update:\n\n"; result += details; result += "\n\nYou can try downloading and installing the latest version of " - "Plex Home Theater from http://plexapp.com"; + "OpenPHT from http://www.openpht.tv"; return result; } diff --git a/plex/scripts/WindowsSign.cmd b/plex/scripts/WindowsSign.cmd index 13155f152..1e1ab3d3c 100644 --- a/plex/scripts/WindowsSign.cmd +++ b/plex/scripts/WindowsSign.cmd @@ -7,23 +7,17 @@ rem setlocal set TargetFile=%~1 -if not exist "%SigningCert%" ( - set SigningCert=%~dp0PlexTestSPC.pfx -) - -set PasswordArg= -if "%SigningCertPassword%" NEQ "" ( - set PasswordArg=/p %SigningCertPassword% -) -signtool.exe sign /f "%SigningCert%" %PasswordArg% /t http://timestamp.verisign.com/scripts/timstamp.dll "%TargetFile%" +signtool.exe sign /a /sm /t http://timestamp.verisign.com/scripts/timstamp.dll "%TargetFile%" if "%errorlevel%" == 1 ( echo FATAL ERROR - could sign %TargetFile% + exit /b 1 ) signtool.exe verify /pa "%TargetFile%" if "%errorlevel%" == 1 ( echo FATAL ERROR - could not verify signature for %TargetFile% + exit /b 1 ) endlocal diff --git a/plex/scripts/build_window_release.bat b/plex/scripts/build_window_release.bat index 18708232c..8540a2e42 100644 --- a/plex/scripts/build_window_release.bat +++ b/plex/scripts/build_window_release.bat @@ -17,8 +17,8 @@ cd build-windows-i386 cmake -GNinja -DCMAKE_INSTALL_PREFIX=output -DCMAKE_BUILD_TYPE=RelWithDebInfo .. ninja release_package -move c:\tmp\PlexHomeTheater*exe %WORKSPACE%\upload -move PlexHomeTheater*7z %WORKSPACE%\upload -move PlexHomeTheater*symsrv*zip %WORKSPACE%\upload -move c:\tmp\PlexHomeTheater*zip %WORKSPACE%\upload -move c:\tmp\PlexHomeTheater*manifest.xml %WORKSPACE%\upload +move c:\tmp\OpenPHT*exe %WORKSPACE%\upload +move OpenPHT*7z %WORKSPACE%\upload +move OpenPHT*symsrv*zip %WORKSPACE%\upload +move c:\tmp\OpenPHT*zip %WORKSPACE%\upload +move c:\tmp\OpenPHT*manifest.xml %WORKSPACE%\upload diff --git a/plex/scripts/create_symstore.cmd b/plex/scripts/create_symstore.cmd index f6a160ae0..8dd295d2b 100644 --- a/plex/scripts/create_symstore.cmd +++ b/plex/scripts/create_symstore.cmd @@ -6,15 +6,15 @@ set SymStoreRoot=symbols rd /s /q "%SymStoreRoot%" md "%SymStoreRoot%" -symstore add /s "%SymStoreRoot%" /f "plex\Plex Home Theater.exe" /t PHT /compress +symstore add /s "%SymStoreRoot%" /f "plex\OpenPHT.exe" /t PHT /compress if errorlevel 1 ( - echo ERROR - Symstore Plex Home Theater.exe failed + echo ERROR - Symstore OpenPHT.exe failed exit /b 1 ) -symstore add /s "%SymStoreRoot%" /f "plex\Plex Home Theater.pdb" /t PHT /compress +symstore add /s "%SymStoreRoot%" /f "plex\OpenPHT.pdb" /t PHT /compress if errorlevel 1 ( - echo ERROR - Symstore Plex Home Theater.pdb failed + echo ERROR - Symstore OpenPHT.pdb failed exit /b 1 ) @@ -22,6 +22,6 @@ rd /s /q "%SymStoreRoot%\000Admin" del /f "%SymStoreRoot%\pingme.txt" del /f /s /q "%SymStoreRoot%\refs.ptr" -%1/project/Win32BuildSetup/tools/7z/7za.exe a -r -tZIP PlexHomeTheater-%2-symsrv.zip "%SymStoreRoot%" +%1/project/Win32BuildSetup/tools/7z/7za.exe a -r -tZIP OpenPHT-%2-symsrv.zip "%SymStoreRoot%" rem rd /s /x "%SymStoreRoot%" diff --git a/plex/scripts/create_update.py b/plex/scripts/create_update.py index 3728ced7c..c49f75081 100755 --- a/plex/scripts/create_update.py +++ b/plex/scripts/create_update.py @@ -139,14 +139,14 @@ def create_update(product, version, output, platform, input, delta, fversion, ma if __name__ == "__main__": o = optparse.OptionParser() - o.add_option("-r", dest="product", default="PlexHomeTheater", type="string") + o.add_option("-r", dest="product", default="OpenPHT", type="string") o.add_option('-v', dest="version", default="NOVERSION", type="string") o.add_option("-o", dest="output", default=".", type="string") o.add_option("-p", dest="platform", default=platform.system().lower(), type="string") - o.add_option("-i", dest="input", default="output/Plex Home Theater.app", type="string") + o.add_option("-i", dest="input", default="output/OpenPHT.app", type="string") o.add_option("-d", dest="delta", default=False, action="store_true") o.add_option("-f", dest="fromversion", default="", type="string") - o.add_option("-m", dest="mainbinary", default="Contents/MacOS/Plex Home Theater", type="string") + o.add_option("-m", dest="mainbinary", default="Contents/MacOS/OpenPHT", type="string") (options, args) = o.parse_args() diff --git a/plex/scripts/fetch-depends.sh b/plex/scripts/fetch-depends.sh index 127d39282..f25d5ca84 100755 --- a/plex/scripts/fetch-depends.sh +++ b/plex/scripts/fetch-depends.sh @@ -56,26 +56,26 @@ if [ ! -d plex/Dependencies/$outputdir-xbmc-$DEPEND_HASH -o ! -d plex/Dependenci echo "-- Missing plex/Dependencies/built-depends/$outputdir-xbmc-$DEPEND_HASH.tar.xz" curl --head --fail -s $NIGHTLIES_ROOT/plex-dependencies/plex-home-theater-dependencies/latest/$outputdir-xbmc-$DEPEND_HASH.tar.xz > /dev/null || fail xbmc $DEPEND_HASH echo "-- Fetching $NIGHTLIES_ROOT/plex-dependencies/plex-home-theater-dependencies/latest/$outputdir-xbmc-$DEPEND_HASH.tar.xz" - curl -s --fail $NIGHTLIES_ROOT/plex-dependencies/plex-home-theater-dependencies/latest/$outputdir-xbmc-$DEPEND_HASH.tar.xz -o /tmp/$outputdir-xbmc-$DEPEND_HASH.tar.xz || fail xbmc $DEPEND_HASH + curl -s --fail $NIGHTLIES_ROOT/plex-dependencies/plex-home-theater-dependencies/latest/$outputdir-xbmc-$DEPEND_HASH.tar.xz -o $TMPDIR$outputdir-xbmc-$DEPEND_HASH.tar.xz || fail xbmc $DEPEND_HASH else - cp -v plex/Dependencies/built-depends/$outputdir-xbmc-$DEPEND_HASH.tar.xz /tmp/ + cp -v plex/Dependencies/built-depends/$outputdir-xbmc-$DEPEND_HASH.tar.xz $TMPDIR fi if [ ! -e plex/Dependencies/built-depends/$outputdir-ffmpeg-$FFMPEG_HASH.tar.xz ]; then curl --head --fail -s $NIGHTLIES_ROOT/plex-dependencies/plex-home-theater-dependencies/latest/$outputdir-ffmpeg-$FFMPEG_HASH.tar.xz > /dev/null || fail ffmpeg $FFMPEG_HASH echo "-- Fetching $NIGHTLIES_ROOT/plex-dependencies/plex-home-theater-dependencies/latest/$outputdir-ffmpeg-$FFMPEG_HASH.tar.xz" - curl -s --fail $NIGHTLIES_ROOT/plex-dependencies/plex-home-theater-dependencies/latest/$outputdir-ffmpeg-$FFMPEG_HASH.tar.xz -o /tmp/$outputdir-ffmpeg-$FFMPEG_HASH.tar.xz || fail ffmpeg $FFMPEG_HASH + curl -s --fail $NIGHTLIES_ROOT/plex-dependencies/plex-home-theater-dependencies/latest/$outputdir-ffmpeg-$FFMPEG_HASH.tar.xz -o $TMPDIR$outputdir-ffmpeg-$FFMPEG_HASH.tar.xz || fail ffmpeg $FFMPEG_HASH else - cp -v plex/Dependencies/built-depends/$outputdir-ffmpeg-$FFMPEG_HASH.tar.xz /tmp/ + cp -v plex/Dependencies/built-depends/$outputdir-ffmpeg-$FFMPEG_HASH.tar.xz $TMPDIR fi echo "-- Unpacking $outputdir-xbmc-$DEPEND_HASH.tar.xz" - gtar -xaf /tmp/$outputdir-xbmc-$DEPEND_HASH.tar.xz -C plex/Dependencies + gtar -xaf $TMPDIR$outputdir-xbmc-$DEPEND_HASH.tar.xz -C plex/Dependencies mv plex/Dependencies/$outputdir plex/Dependencies/$outputdir-xbmc-$DEPEND_HASH plex/scripts/fix_install_names.py $ROOT/plex/Dependencies/$outputdir-xbmc-$DEPEND_HASH/lib echo "-- Unpacking $outputdir-ffmpeg-$FFMPEG_HASH.tar.xz" - gtar -xaf /tmp/$outputdir-ffmpeg-$FFMPEG_HASH.tar.xz -C plex/Dependencies + gtar -xaf $TMPDIR$outputdir-ffmpeg-$FFMPEG_HASH.tar.xz -C plex/Dependencies mv plex/Dependencies/ffmpeg-$outputdir plex/Dependencies/$outputdir-ffmpeg-$FFMPEG_HASH plex/scripts/fix_install_names.py $ROOT/plex/Dependencies/$outputdir-ffmpeg-$FFMPEG_HASH/lib fi diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index ba192344c..629974d9e 100755 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -702,15 +702,15 @@ bool CApplication::Create() #endif #else #if defined(TARGET_DARWIN_OSX) - CLog::Log(LOGNOTICE, "Starting Plex Home Theater (%s), Platform: Darwin OSX (%s). Built on %s", g_infoManager.GetVersion().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__); + CLog::Log(LOGNOTICE, "Starting OpenPHT (%s), Platform: Darwin OSX (%s). Built on %s", g_infoManager.GetVersion().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__); #elif defined(TARGET_DARWIN_IOS) - CLog::Log(LOGNOTICE, "Starting Plex Home Theater (%s), Platform: Darwin iOS (%s). Built on %s", g_infoManager.GetVersion().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__); + CLog::Log(LOGNOTICE, "Starting OpenPHT (%s), Platform: Darwin iOS (%s). Built on %s", g_infoManager.GetVersion().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__); #elif defined(__FreeBSD__) - CLog::Log(LOGNOTICE, "Starting Plex Home Theater (%s), Platform: FreeBSD (%s). Built on %s", g_infoManager.GetVersion().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__); + CLog::Log(LOGNOTICE, "Starting OpenPHT (%s), Platform: FreeBSD (%s). Built on %s", g_infoManager.GetVersion().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__); #elif defined(_LINUX) - CLog::Log(LOGNOTICE, "Starting Plex Home Theater (%s), Platform: Linux (%s, %s). Built on %s", g_infoManager.GetVersion().c_str(), g_sysinfo.GetLinuxDistro().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__); + CLog::Log(LOGNOTICE, "Starting OpenPHT (%s), Platform: Linux (%s, %s). Built on %s", g_infoManager.GetVersion().c_str(), g_sysinfo.GetLinuxDistro().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__); #elif defined(_WIN32) - CLog::Log(LOGNOTICE, "Starting Plex Home Theater (%s), Platform: %s. Built on %s (compiler %i)", g_infoManager.GetVersion().c_str(), g_sysinfo.GetKernelVersion().c_str(), __DATE__, _MSC_VER); + CLog::Log(LOGNOTICE, "Starting OpenPHT (%s), Platform: %s. Built on %s (compiler %i)", g_infoManager.GetVersion().c_str(), g_sysinfo.GetKernelVersion().c_str(), __DATE__, _MSC_VER); #if defined(__arm__) if (g_cpuInfo.GetCPUFeatures() & CPU_FEATURE_NEON) CLog::Log(LOGNOTICE, "ARM Features: Neon enabled"); @@ -813,7 +813,7 @@ bool CApplication::Create() /* PLEX */ /* now that we have our directories we can fire up our crashreporter */ #if defined(HAVE_BREAKPAD) && !defined(_DEBUG) - m_breakpad = new BreakpadScope("PLEX HOME THEATER"); + m_breakpad = new BreakpadScope("OPENPHT"); #endif /* PLEX */ @@ -1028,7 +1028,7 @@ bool CApplication::InitWindow() #ifndef __PLEX__ if (!g_Windowing.CreateNewWindow("XBMC", bFullScreen, g_settings.m_ResInfo[RES_WINDOW], OnEvent)) #else - if (!g_Windowing.CreateNewWindow("Plex Home Theater", bFullScreen, g_settings.m_ResInfo[RES_WINDOW], OnEvent)) + if (!g_Windowing.CreateNewWindow("OpenPHT", bFullScreen, g_settings.m_ResInfo[RES_WINDOW], OnEvent)) #endif { CLog::Log(LOGFATAL, "CApplication::Create: Unable to create window"); @@ -1039,7 +1039,7 @@ bool CApplication::InitWindow() #ifndef __PLEX__ if (!g_Windowing.CreateNewWindow("XBMC", bFullScreen, g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution], OnEvent)) #else - if (!g_Windowing.CreateNewWindow("Plex Home Theater", bFullScreen, g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution], OnEvent)) + if (!g_Windowing.CreateNewWindow("OpenPHT", bFullScreen, g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution], OnEvent)) #endif { CLog::Log(LOGFATAL, "CApplication::Create: Unable to create window"); diff --git a/xbmc/network/upnp/UPnP.cpp b/xbmc/network/upnp/UPnP.cpp index b8fc3ed6e..29c19b7a5 100644 --- a/xbmc/network/upnp/UPnP.cpp +++ b/xbmc/network/upnp/UPnP.cpp @@ -409,12 +409,12 @@ CUPnP::CreateRenderer(int port /* = 0 */) device->m_Manufacturer = "Team XBMC"; device->m_ManufacturerURL = "http://www.xbmc.org/"; #else - device->m_ModelName = "Plex Home Theater"; + device->m_ModelName = "OpenPHT"; device->m_ModelNumber = g_infoManager.GetVersion().c_str(); - device->m_ModelDescription = "Plex Home Theater - Media Renderer"; - device->m_ModelURL = "http://www.plexapp.com/"; - device->m_Manufacturer = "Plex inc"; - device->m_ManufacturerURL = "http://www.plexapp.com/"; + device->m_ModelDescription = "OpenPHT - Media Renderer"; + device->m_ModelURL = "http://www.openpht.tv/"; + device->m_Manufacturer = "Team OpenPHT"; + device->m_ManufacturerURL = "http://www.openpht.tv/"; #endif return device; diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp index 91edabd85..bd6a6504e 100644 --- a/xbmc/settings/GUIWindowSettingsCategory.cpp +++ b/xbmc/settings/GUIWindowSettingsCategory.cpp @@ -3396,18 +3396,19 @@ void CGUIWindowSettingsCategory::FillInPlexUpdateChannels(CSetting *pSetting) pControl->SetType(SPIN_CONTROL_TYPE_TEXT); pControl->Clear(); - CMyPlexUserInfo user = g_plexApplication.myPlexManager->GetCurrentUserInfo(); + //CMyPlexUserInfo user = g_plexApplication.myPlexManager->GetCurrentUserInfo(); pControl->AddLabel(g_localizeStrings.Get(40003), CMyPlexUserInfo::ROLE_USER); + pControl->AddLabel(g_localizeStrings.Get(40007), CMyPlexUserInfo::ROLE_PLEXPASS); - if (user.hasRole(CMyPlexUserInfo::ROLE_PLEXPASS) || user.hasRole(CMyPlexUserInfo::ROLE_NINJA) || user.hasRole(CMyPlexUserInfo::ROLE_EMPLOYEE)) - pControl->AddLabel(g_localizeStrings.Get(40004), CMyPlexUserInfo::ROLE_PLEXPASS); + //if (user.hasRole(CMyPlexUserInfo::ROLE_PLEXPASS) || user.hasRole(CMyPlexUserInfo::ROLE_NINJA) || user.hasRole(CMyPlexUserInfo::ROLE_EMPLOYEE)) + // pControl->AddLabel(g_localizeStrings.Get(40004), CMyPlexUserInfo::ROLE_PLEXPASS); - if (user.hasRole(CMyPlexUserInfo::ROLE_NINJA) || user.hasRole(CMyPlexUserInfo::ROLE_EMPLOYEE)) - pControl->AddLabel(g_localizeStrings.Get(40005), CMyPlexUserInfo::ROLE_NINJA); + //if (user.hasRole(CMyPlexUserInfo::ROLE_NINJA) || user.hasRole(CMyPlexUserInfo::ROLE_EMPLOYEE)) + // pControl->AddLabel(g_localizeStrings.Get(40005), CMyPlexUserInfo::ROLE_NINJA); - if (user.hasRole(CMyPlexUserInfo::ROLE_EMPLOYEE)) - pControl->AddLabel(g_localizeStrings.Get(40006), CMyPlexUserInfo::ROLE_EMPLOYEE); + //if (user.hasRole(CMyPlexUserInfo::ROLE_EMPLOYEE)) + // pControl->AddLabel(g_localizeStrings.Get(40006), CMyPlexUserInfo::ROLE_EMPLOYEE); if (pControl->GetMaximum() < 1) /* only one choice */