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

184 commits

Author SHA1 Message Date
Afterster
d83bf5d169 Fix MySQL requests to support ONLY_FULL_GROUP_BY mode 2015-12-29 06:18:32 +01:00
Afterster
cb769a5c8d Add log message in case of transcode process error
Fix code style
2015-12-03 22:07:57 +01:00
Afterster
9c3637b879 Change license from GPLv2 to AGPLv3 2015-12-02 20:46:34 +01:00
Afterster
5124a5ed4c Merge branch 'develop' of https://github.com/Psy-Virus/ampache into Psy-Virus-develop
Conflicts:
	templates/show_album_row.inc.php
	templates/show_artist_row.inc.php
	templates/show_label_row.inc.php
	templates/show_playlist_song_row.inc.php
	templates/show_song_row.inc.php
	templates/show_video_row.inc.php

Apply align_equals and concat_with_spaces on code style
2015-11-07 08:08:59 +01:00
Afterster
bbd32d7a17 Keep %SAMPLE% variable for compatibility reason 2015-10-03 09:22:29 +02:00
Manuel
50c1ecc037 Various fixes based on transcode bit rate handling
config/ampache.cfg.php.dist
+ updated version because the changes depend on database and base code
changes
+ renamed variable `%SAMPLE%` -> `%BITRATE%`

lib/class/stream.class.php
+ changed `AmpConfig::get('sample_rate');` ->
`AmpConfig::get('transcode_bitrate');` due to db changes
+ renamed variable `%SAMPLE%` -> `%BITRATE`
+ renamed variable `$sample_rate` -> `$bit_rate`
+ renamed variable `$user_sample_rate` -> `$user_bit_rate`

lib/class/update.class.php
+ New update function to change preference name `sample_rate` ->
`transcode_bitrate`

lib/init.php
+ changed config file version for config autoupdate

lib/preference.php
+ changed case `sample_rate` -> `transcode_bitrate` due to db changes
2015-09-26 17:38:13 +02:00
Afterster
2424c76ab7 Fixing Boolean comparison operators 2015-09-06 11:30:49 +02:00
Afterster
47a6585c88 Use latest php-cs-fixer version 2015-07-29 21:59:12 +02:00
nan4k7
48b6eb2e40 Bug detecting OS
This is exactly the other way as how the IF is created.
2015-07-04 09:49:20 -03:00
Afterster
d53527378b Move process kill to stream function 2015-05-31 23:54:18 +02:00
nan4k7
9792b55c5e Update stream.class.php 2015-05-31 22:57:30 +02:00
Afterster
0bce1211fe Add option to hide user fullname by default 2015-05-14 23:07:36 +02:00
Afterster
26b30a2817 Add Podcast links to albums and artists if RSS Feed enabled 2015-05-02 10:00:13 +02:00
Afterster
301c43c0bb Fix transcoding stderr output read 2015-02-27 22:56:02 +01:00
wagnered
19303bc9c0 Modified get_image_preview to include a check that'transcode_input' is defined and added it to the command. 2015-01-28 19:32:11 -08:00
Lawrence Brown
60a653daf4 copyright 2014 -> 2015
janitorial services
2015-01-04 21:36:41 +00:00
Afterster
2bbed12eb7 Add Aurora.js support in webplayer
Add transcode settings per player
2014-10-12 12:55:31 +02:00
Afterster
2c221e8216 Add user geolocation and user statistical graphs 2014-10-06 01:05:17 +02:00
Afterster
160c59dea2 Fix Scrutinizer issues 2014-09-30 07:47:21 +02:00
Afterster
49cd42562b Replace iframe with Ajax page loading :) :) 2014-08-08 01:36:07 +02:00
Afterster
97ade3bc77 Fix subtitle stream on web player 2014-08-04 02:58:45 +02:00
Afterster
993e5f9fa8 Add hls stream
Improve Plex video stream & transcode
2014-08-04 01:33:44 +02:00
Afterster
a9a050daff Disable Beautiful Url on XML-API for retro-compatibility reason 2014-07-18 23:35:33 +02:00
Afterster
daa8b3133b Add video subtitle support
Add local_web_path setting (fix #324)
2014-07-16 22:41:19 +02:00
Afterster
25656f0c28 Fix content-type header when transcode 2014-07-10 23:07:28 +02:00
Afterster
7258fdcb63 Add video image preview 2014-07-08 09:05:45 +02:00
Afterster
cd0b66391e Ignore some unused warnings 2014-05-26 00:02:11 +02:00
Afterster
041dfda1fc Remove remaining unused code 2014-05-25 23:23:52 +02:00
Afterster
b16958f44e Remove old code and fix old php errors 2014-05-25 22:54:04 +02:00
Afterster
98664d2a84 Update copyright years 2014-05-18 09:53:57 +02:00
SUTJael
39e6e76f59 Fix code style 2014-05-07 15:49:47 +02:00
SUTJael
598464f114 Add some logs to transcode settings 2014-04-18 20:04:45 +02:00
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