Skip to content

Commit

Permalink
Merge remote-tracking branch 'jellyfin-samsungtv-updated/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ShaheedHaque committed Jul 3, 2021
2 parents a542ed9 + 5878853 commit b2d92ae
Show file tree
Hide file tree
Showing 25 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<projectDescription>
<name>Emby</name>
<name>Jellyfin</name>
<comment>
</comment>
<projects>
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
Warning: This app is a legacy program meant for older Samsung Smart TVs running Orsay (pre-2015), which has since been replaced by Tizen. It may be possible to use this app by side-loading, but it is considered unsupported (we are unable to help you with it).

You may also wish to try a web browser with Jellyfin, wherever possible.

This is a fork of the original jellyfin-samsungtv repo which is now archived. If you own an older samsung TV as I do you probably wanted a more updated app. Feel free to use and start issues and pull requests. However, I am not the original developer of this app so I maynot be able to provide the best help.
2 changes: 1 addition & 1 deletion app/javascript/Gui/GuiPage_NewServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GuiPage_NewServer.start = function() {

//Insert html into page
document.getElementById("pageContent").innerHTML = "<div class='GuiPage_NewServer12key'> \
<p style='padding-bottom:5px;'>Enter the IP address & port number of your Emby server. <br>(You can leave the port blank for 8096)</p> \
<p style='padding-bottom:5px;'>Enter the IP address & port number of your Jellyfin server. <br>(You can leave the port blank for 8096)</p> \
<form><input id='1' type='text' size='5' maxlength='3' value=''/>. \
<input id='2' type='text' size='5' maxlength='3' value=''/>. \
<input id='3' type='text' size='5' maxlength='3' value=''/>. \
Expand Down
4 changes: 2 additions & 2 deletions app/javascript/Server.js
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ Server.testConnectionSettings = function (server,fromFile) {
ServerVersion.start();
}
} else if (xmlHttp.status === 0) {
GuiNotifications.setNotification("Your Emby server is not responding.","Network Error "+xmlHttp.status,true);
GuiNotifications.setNotification("Your Jellyfin server is not responding.","Network Error "+xmlHttp.status,true);
Support.removeSplashScreen();
if (fromFile == true) {
setTimeout(function(){
Expand All @@ -536,7 +536,7 @@ Server.testConnectionSettings = function (server,fromFile) {
}, 3000);
}
} else {
GuiNotifications.setNotification("Emby server connection error.","Network Error "+xmlHttp.status,true);
GuiNotifications.setNotification("Jellyfin server connection error.","Network Error "+xmlHttp.status,true);
Support.removeSplashScreen();
if (fromFile == true) {
setTimeout(function(){
Expand Down
8 changes: 4 additions & 4 deletions config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
<childlock itemtype="boolean">n</childlock>
<videomute itemtype="boolean">n</videomute>
<dcont itemtype="boolean">y</dcont>
<widgetname itemtype="string">Emby</widgetname>
<description itemtype="string">Emby for Samsung Smart TV</description>
<widgetname itemtype="string">Jellyfin</widgetname>
<description itemtype="string">Jellyfin for Samsung Smart TV</description>
<width itemtype="string">1920</width>
<height itemtype="string">1080</height>
<author itemtype="group">
<name itemtype="String">ChessDragon136</name>
<email itemtype="string">emby.media/community</email>
<link itemtype="string">emby.media</link>
<email itemtype="string">forum.jellyfin.org</email>
<link itemtype="string">jellyfin.org</link>
<organization itemtype="string"/>
</author>
</widget>
Binary file modified icon/MB3_106_87.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icon/MB3_115_95.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icon/MB3_85_70.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icon/MB3_95_78.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/artist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/fresh-40x40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/loginusernoimage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/menu/Home-46x37.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/musicplayer/fast-forward-selected-53x37.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/musicplayer/fast-rewind-selected-54x37.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/musicplayer/pause-selected-32x37.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/musicplayer/play-selected-29x37.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/musicplayer/skip-next-selected-36x37.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/musicplayer/skip-previous-selected-36x37.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/musicplayer/stop-selected-37x37.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/rotten-40x40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/sliderPosition.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/splash.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
<div id="guiBlueButton" class="BlueButton" style="visibility:hidden"></div>
<div id="guiReturnButton" class="ReturnButton" style="visibility:hidden"></div>

<div id="exitConfirm" class="exitConfirm">Are you sure you want exit Emby?
<div id="exitConfirm" class="exitConfirm">Are you sure you want exit Jellyfin?
<div id="exitConfirmYes" class="exitConfirmYes">Yes</div>
<div id="exitConfirmNo" class="exitConfirmNo">No</div>
</div>
Expand Down

0 comments on commit b2d92ae

Please sign in to comment.