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

152 commits

Author SHA1 Message Date
SUTJael
5f5460708a Tags requests improved. Ability to edit/delete tags depending on user rights. (Fix #135) (Fix #127) 2014-02-18 19:32:16 +01:00
Afterster
6cdb33ae32 Working Broadcast feature 2014-02-09 23:00:50 +01:00
Afterster
e8db93ab3c Add Channel core with Icecast compability 2014-02-03 00:30:04 +01:00
Afterster
09bac5dad1 Improve now playing when filtered by user 2014-01-11 00:37:56 +01:00
Afterster
08cdf73349 Merge branch 'master' of github.com:ampache-doped/ampache
Conflicts:
	lib/class/update.class.php
2013-12-26 22:17:13 +01:00
SUTJael
9edffd6fb8 Personal information visibility (Fix #81) 2013-12-26 12:47:06 +01:00
SUTJael
228cbd8648 Ability to hide personal info from other user (now playing, recently played). Fix #78
Fix colspan on video list.
2013-12-16 15:38:21 +01:00
Afterster
5eceaf2aea Rename Config class to AmpConfig class to avoid conflict with PEAR (fix #68) 2013-12-13 08:36:23 +01:00
SUTJael
9aeeaaa6b8 Showing agent in recently played list 2013-12-11 14:10:09 +01:00
Afterster
f50d8a93a5 Add optional client name when playing 2013-12-07 09:41:20 +01:00
Afterster
5dd56668bb Fix code style 2013-11-18 08:16:57 +01:00
Afterster
2f41d29e8f Add 'Now Playing' insertion date field and an option to show current played song in HTML5 page title 2013-11-18 08:08:25 +01:00
Afterster
22cb316a48 Ampache code now respect PSR-2 code style 2013-11-17 18:54:14 +01:00
Afterster
4ad6afd056 Optional Now Playing filtered by user option 2013-11-10 12:07:26 +01:00
Afterster
0eb6ba2eb6 Move bitrate selection in new function 2013-11-09 13:32:51 +01:00
Paul Arthur
c6680009ce Don't open stderr on Windows
According to GH #80 Windows can't handle this.
2013-11-05 21:04:08 -05:00
Toilal
1d881ae018 Stream::start_transcode: Fix typo in query 2013-05-06 15:23:34 -04:00
Paul Arthur
252abb8bea Use parameterised queries in Stream 2013-01-29 11:14:55 -05:00
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