Navigation

Changeset a5669db9ba0dff76736486bc75e679df460dca36

Timestamp:

11/02/07 22:10:47 (1 year ago)

Author:

Jason Michalski <armooo@armooo.net>

git-committer:

Jason Michalski <armooo@armooo.net> 1194059447 +0000

git-parent:

[5bf1bd3d0d7775822c88bea395306a0c5d786f5b]

git-author:

Jason Michalski <armooo@armooo.net> 1194059447 +0000

Message:

Per tivo height/width

Files:

r5bf1bd3	ra5669db
61	61	return nearest(width, getValidWidths())
62	62
63		def getTivoHeight():
	63	def getTivoHeight(tsn):
	64	if tsn and config.has_section('_tivo_' + tsn):
	65	try:
	66	return config.get('_tivo_' + tsn, 'height_br')
	67	except NoOptionError:
	68	pass
	69
64	70	try:
65	71	height = int(config.get('Server', 'height'))
66		~~print nearest(height, getValidHeights())~~
67	72	return nearest(height, getValidHeights())
68	73	except NoOptionError: #default
69	74	return 480
70	75
71		def getTivoWidth():
	76	def getTivoWidth(tsn):
	77	if tsn and config.has_section('_tivo_' + tsn):
	78	try:
	79	return config.get('_tivo_' + tsn, 'width')
	80	except NoOptionError:
	81	pass
	82
72	83	try:
73	84	width = int(config.get('Server', 'width'))
74		~~print nearestTivoWidth(width)~~
75	85	return nearestTivoWidth(width)
76	86	except NoOptionError: #default

r5bf1bd3	ra5669db
6	6
7	7	debug = Config.getDebug()
8		~~TIVO_WIDTH = Config.getTivoWidth()~~
9		~~TIVO_HEIGHT = Config.getTivoHeight()~~
10	8	MAX_VIDEO_BR = Config.getMaxVideoBR()
11	9	BUFF_SIZE = Config.getBuffSize()
…	…
73	71
74	72	def select_aspect(inFile, tsn = ''):
	73	TIVO_WIDTH = Config.getTivoWidth(tsn)
	74	TIVO_HEIGHT = Config.getTivoHeight(tsn)
	75
75	76	type, width, height, fps, millisecs = video_info(inFile)
76	77