wplayer

Check-in [b7a4eb540e]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix regression for non-transcode code path
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | master | trunk
Files: files | file ages | folders
SHA3-256:b7a4eb540e724d704aede8f030493651f6ad2a630179accf592f2605bc0c4194
User & Date: ajv-899-334-8894@vsta.org 2017-10-24 13:48:39
Context
2017-11-22
04:21
Embrace ES6 now that we can play flac on FF using transcoding. Shorten playlist entries when they have a common path. check-in: bc0d6d6ec2 user: ajv-899-334-8894@vsta.org tags: master, trunk
2017-10-24
13:48
Fix regression for non-transcode code path check-in: b7a4eb540e user: ajv-899-334-8894@vsta.org tags: master, trunk
05:00
Permit player to be entered with "...?noflac", and have it receive a transcode to ogg. check-in: b0fbc45b9f user: ajv-899-334-8894@vsta.org tags: master, trunk
Changes
Hide Diffs Unified Diffs Show Whitespace Changes Patch

Changes to get.py.

187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
	    buf = self._send_dir(indexed, path)
	else:
            # get /path/to/foo.flac?asogg -> stream a sox
            #  conversion of foo.flac
            # This lets us stream to players without flac
            #  support, or where the flac bitrate is too
            #  high for the network path.
            if "asogg" in self.vals:
                print "GET converted file", path
                buf = self.send_ogg(path)
            else:
                print "GET file", path
                buf = self.send_files(path)
	return True,buf








|







187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
	    buf = self._send_dir(indexed, path)
	else:
            # get /path/to/foo.flac?asogg -> stream a sox
            #  conversion of foo.flac
            # This lets us stream to players without flac
            #  support, or where the flac bitrate is too
            #  high for the network path.
            if self.vals and ("asogg" in self.vals):
                print "GET converted file", path
                buf = self.send_ogg(path)
            else:
                print "GET file", path
                buf = self.send_files(path)
	return True,buf