From 1fa51c9b4c277b42f80404cb2e4e71fa99a568ca Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Tue, 8 Dec 2015 22:24:03 -0500
Subject: [PATCH] Eliminate width and height options.

---
 config.py                 |  6 ------
 plugins/settings/help.txt | 28 ----------------------------
 pyTivo.conf.dist          | 10 ----------
 3 files changed, 44 deletions(-)

diff --git a/config.py b/config.py
index 2d75005..90353fc 100644
--- a/config.py
+++ b/config.py
@@ -292,18 +292,12 @@ def nearestTivoWidth(width):
     return nearest(width, getValidWidths())
 
 def getTivoHeight(tsn):
-    height = get_tsn('height', tsn)
-    if height:
-        return nearestTivoHeight(int(height))
     if is4Ktivo(tsn):
         return 2160
     else:
         return [480, 1080][isHDtivo(tsn)]
 
 def getTivoWidth(tsn):
-    width = get_tsn('width', tsn)
-    if width:
-        return nearestTivoWidth(int(width))
     if is4Ktivo(tsn):
         return 3840
     else:
diff --git a/plugins/settings/help.txt b/plugins/settings/help.txt
index 69e698c..048bd85 100644
--- a/plugins/settings/help.txt
+++ b/plugins/settings/help.txt
@@ -273,34 +273,6 @@ experiencing audio/video sync issues and wish to test a different value.
 Example Settings: 1024k, 2048k, 4096k
 Available In: Tivos, FK_tivos, HD_tivos, SD_tivos
 
-width
-
-Default Setting: 544 for S2, 1920 for S3+
-Valid Entries: Any valid pixel dimension. Setting will be rounded to
-nearest acceptable TiVo dimension.
-Required: No
-Description: Allows you to choose the output dimension of the transcoded
-videos. SD units are limited to 720 and below. Likely HD users will want
-to choose a higher value. Higher values may slow down transcoding and
-will increase the file size. Increased file sizes take up more room on
-the TiVo and take longer to transfer over the network.
-Example Settings: 1920, 1440, 1280, 720, 704, 544, 480, 352.
-Available In: Tivos, FK_tivos, HD_tivos, SD_tivos
-
-height
-
-Default Setting: 480 for S2, 1080 for S3+
-Valid Entries: Any valid pixel dimension. Setting will be rounded to
-nearest acceptable TiVo dimension
-Required: No
-Description: Allows you to choose the output dimension of the transcoded
-videos. SD units are limited to 480 and below. Likely HD users will want
-to choose a higher value. Higher values may slow down transcoding and
-will increase the file size. Increased file sizes take up more room on
-the TiVo and take longer to transfer over the network.
-Example Settings: 1080, 720, 480
-Available In: Tivos, FK_tivos, HD_tivos, SD_tivos
-
 audio_br
 
 Default Setting: same bitrate as source or 448k
diff --git a/pyTivo.conf.dist b/pyTivo.conf.dist
index 29d7b45..b4030e2 100644
--- a/pyTivo.conf.dist
+++ b/pyTivo.conf.dist
@@ -42,14 +42,6 @@ ffmpeg=/usr/bin/ffmpeg
 # broadcasts.)
 #beacon=192.168.1.255 listen
 
-# Output Pixel Width:
-# Width, defaults to 544 for S2, 1920 for S3/HD
-# Height, defaults to 480 for S2, 1080 for S3/HD
-# Valid widths: [S3/HD = 1920, 1440, 1280], [S2/S3/HD = 720, 704, 544, 480, 352]
-# Valid heights: [S3/HD = 1080, 720], [S2/S3/HD = 480]
-#width=1920
-#height=1080
-
 # Togo settings:
 # Set this up if you wish to have TiVo ToGo support.  This allows you to
 # copy videos from your TiVo via a web page. 
@@ -64,8 +56,6 @@ ffmpeg=/usr/bin/ffmpeg
 # If you want to use 16:9 or 4:3 on this tivo
 #aspect169=true
 
-#width=1440
-#height=720
 #audio_br=320K
 #video_br=12Mi
 
-- 
2.11.4.GIT