1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-04 18:29:40 +02:00
Commit graph

134 commits

Author SHA1 Message Date
Paul Arthur
3010ae8c85 Log stderr when we transcode
Now you shouldn't need to manually run the command to see what went
wrong.
2013-01-28 22:00:08 -05:00
Paul Arthur
fbbb015950 Use Session for stream sessions 2013-01-28 21:46:00 -05:00
Paul Arthur
1a164ba699 Yank out the Flash player by the roots. 2013-01-28 13:26:11 -05:00
Holger Brunn
959aebe07f Add an HTML5 player
Merge request #20.  Basic, not very pretty, but works and, unlike the
Flash player, is maintainable.
2013-01-28 13:26:11 -05:00
Paul Arthur
ef4d366060 Cosmetics: death to tabs
The refactoring I've been doing has reminded me of my strong preference
for spaces, and I feel inclined to impose my will on the tree.
2013-01-26 03:38:46 -05:00
Paul Arthur
1069d54c85 Move clean functions into their respective classes
Uniformly name them gc()
2013-01-25 21:45:47 -05:00
Paul Arthur
16c3ba34fd Cosmetics: clean up heads in lib/ 2013-01-25 18:38:22 -05:00
Paul Arthur
9340ff287c Rework transcoding
Remove some of the roundabout complexity that had built up.  Push people
toward using a single, flexible tool for most of their transcoding
needs.  Increase backend and configuration flexibility to support
user-requested format changes (e.g. for an HTML5 player); this
functionality is not yet exposed.
2013-01-23 13:11:16 -05:00
Paul Arthur
37e09a6428 Clean up the bitrate calculation
Dynamic downsampling, I suppose.
2013-01-23 13:09:36 -05:00
Paul Arthur
e1000558fb Tear the offset/eof/size crap out of Stream
Now that playback doesn't pretend it's supported, we don't need the
fragile hacks to support guessing the content size or 'seeking' within
a transcoded stream.
2013-01-23 13:09:27 -05:00
Paul Arthur
af6fdbb67e Change the gc on stream sessions
It's a little suspect to automatically delete them just because another
was used. Waiting for them to expire will get rid of them plenty quick,
with less chance for weird issues.
2013-01-15 23:15:49 -05:00
Paul Arthur
e2ca05d5b4 Make playlist downloads idempotent
Should fix the VLC plugin, as well as allow direct use of an Ampache
site on Android devices.

First, split the Stream class into an instantiable class that does the
playlist wrangling and a static class that handles the streaming stuff.

How does this work? Well, stream.php does its fancy stuff like
gathering the media IDs and clearing the playlist, but instead
of generating the playlist file there we use the Stream_Playlist
class to store the list of URLs in the database, then redirect to
play/index.php to create the actual download (there are some magic
playlist types like localplay that don't need to redirect.)
The playlist will be cached as long as that stream session is active, so
it can be downloaded multiple times and by clients that don't share the
browser's cookie cache.

Clean up the playlist generation by reducing copypasta.
2013-01-15 11:30:47 -05:00
Paul Arthur
663798897f Cosmetics: remove unused variables in Stream 2013-01-14 13:57:20 -05:00
Paul Arthur
bc90c0128c Start cleaning up the democratic thing.
Whoever wrote the old implementation of get_items suffered from intense fear
and hatred of SQL.
2012-10-15 13:20:28 -04:00
Paul Arthur
408e71344a escapeshellarg's behaviour is locale-dependent
Reimplement it locally so it isn't.  Might fix FS#252.
2012-05-25 16:52:57 -04:00
Brian Hasselbeck
2888851fa3 FS#224 - generated .pls playlist doesn't work in some players
Initial tag is case sensitive; we were emitting [Playlist] but some
players don't accept that. There is unfortunately no real standard to
check, but this does match what Winamp (ack, pthbbt) does.
2012-04-11 16:52:16 -04:00
Paul Arthur
a3a087e404 Update Horde_Browser to latest. 2011-10-27 21:07:54 -04:00
Paul Arthur
f7c1e57cf0 Transcoding/streaming cleanup.
Derive our new filesize from the length, not the previous bitrate and
size.  Allow higher bitrates than the source when they're different
formats.  Return HTTP error codes when an error occurs.  Minor cleanup.
2011-04-08 23:26:21 -04:00
Paul Arthur
4aa256cb07 Clean up some PHPDoc crap
Remove misleading, unvetted, or in some cases just plain wrong data.
Packages and categories weren't being used correctly.  They still
aren't.
2011-04-04 17:37:10 -04:00
momo-i
f99643663c header comment modified for phpdoc 2011-02-03 09:43:46 +09:00
momo-i
d703009677 header comment for phpdoc 2011-02-03 07:30:23 +09:00
momo-i
add54bc230 test header for phpdoc. now using only classes and libraries. 2011-02-02 16:48:45 +09:00
Paul 'flowerysong' Arthur
6277492321 JavaScript cleanup. Consistently use camelCase for naming JS functions. Use
Prototype functionality where possible (particularly for Ajax).  Move our JS
into lib/javascript (I dropped kajax as an external module since the new
ajax.js is completely different apart from function headers.)  Remove unused
JS functions from base.js.
2010-06-24 02:52:01 +00:00
Paul 'flowerysong' Arthur
4b5756ba9d Miscellaneous cleanup. 2010-06-13 08:11:09 +00:00
Paul 'flowerysong' Arthur
bafc1b97ce Change debugging output on transcode. 2010-05-29 23:34:47 +00:00
Karl 'vollmerk' Vollmer
a7e1258587 make downsampling command log a little clearer 2010-05-05 00:28:26 +00:00
Karl 'vollmerk' Vollmer
f0e4f01747 Fix seeking in flacs by adjusting the skip to MM:SS from MM.SS 2010-03-21 21:00:49 +00:00
Karl 'vollmerk' Vollmer
41efcf8c2b typo :( 2010-03-21 13:12:38 +00:00
Karl 'vollmerk' Vollmer
e3300cc53b Resolved #39 - slightly differently then provided patch - Adds attribute hack to keyd_array in xmlclass and video xspf support 2010-03-21 13:07:00 +00:00
Paul 'flowerysong' Arthur
1cb0983ed0 Cosmetics: remove trailing whitespace 2010-03-14 20:14:52 +00:00
Paul 'flowerysong' Arthur
d78c207f76 Cosmetics: use tabs for indentation, tweak some indentation/coding style. 2010-03-14 06:10:27 +00:00
Karl 'vollmerk' Vollmer
45f382b06d Add vim modelines to all php files (Thx ascheel) 2010-03-14 04:53:15 +00:00
Karl 'vollmerk' Vollmer
45bf0c4e0c Fix typos, and tweak insert_now_playing preping for Video now playing 2010-02-14 01:33:15 +00:00
Karl 'vollmerk' Vollmer
77c5628d44 Sync from 3.5 branch still untested 2010-01-25 14:31:39 +00:00
Karl 'vollmerk' Vollmer
2fd6fe6d88 untested change which should fix some stupididity with the flash player 2010-01-25 13:40:49 +00:00
Karl 'vollmerk' Vollmer
9b3232ba29 whole bunch more Dba::query replacements 2009-12-14 05:21:36 +00:00
Karl 'vollmerk' Vollmer
90d61c3deb sync to trunk from 3.5 branch 2009-06-21 21:54:54 +00:00
Karl 'vollmerk' Vollmer
809a3fc72f add download for video that does not work, and most likely break song downloads \o/ 2009-05-15 13:26:30 +00:00
Karl 'vollmerk' Vollmer
d3728b89e0 tweaked fix for rss feed, makes it a little cleaner, fix custom port issue add debug event on unreadable, but still existing files 2009-04-13 15:45:00 +00:00
Karl 'vollmerk' Vollmer
f804835929 some tweaks to make the random play mojo work for streaming, does not work in localplay yet, working on that, nor in democratic play poking that also include asx playlist improvements from jon611 2009-04-08 02:40:07 +00:00
Karl 'vollmerk' Vollmer
375324c9f1 correct mime type for asx to match Microsoft spec 2009-03-29 03:59:47 +00:00
Karl 'vollmerk' Vollmer
fdb7c58cb1 fix typo causing height to not display on art retrival, update to db allowing gc of tmp_browse, add extension to api album art image urls 2009-03-15 16:16:04 +00:00
Karl 'vollmerk' Vollmer
fbad7f92c1 fix xspf playlists - fixes flash player display 2009-03-13 03:26:28 +00:00
Karl 'vollmerk' Vollmer
b49a271f88 fix missing page headers on democratic playlist, also show the voters 2009-03-11 02:46:48 +00:00
Karl 'vollmerk' Vollmer
2799c89f58 add length to the video browse, put in some stuff for the now playing table up the config version in prep for another alpha 2009-03-08 03:54:04 +00:00
Karl 'vollmerk' Vollmer
059f6d4d5c fix download and batch download Addresses #408 and #407 2009-03-07 19:44:00 +00:00
Karl 'vollmerk' Vollmer
a313222ab7 typo 2009-03-02 00:25:41 +00:00
Karl 'vollmerk' Vollmer
abc6eac0e3 maybe fix #404, unconfirmed implemented #405 other misc cleanup 2009-03-01 23:47:36 +00:00
Karl 'vollmerk' Vollmer
6777ec1e2e first work on next db update, correct play_url() removing redundent path, fix democratic play clear 2009-03-01 00:10:49 +00:00
Karl 'vollmerk' Vollmer
dbdd96ed1b unify how the stream is constructed and played, this is a major change might be some regressions 2009-02-28 18:13:48 +00:00