Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,042 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

199 Commits

Author SHA1 Message Date
James f82aef2a85 CC-3566: Preferences->"Fade In" is not respected when Show starts 
- millisecond value of fade was sent wrong from php side.
- crossfade() call was removed and it was causing fade in/out not working.
 2012-04-11 12:27:41 -04:00
Martin Konecny a09a31bc88 CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW 
-pypo side fixed
 2012-04-10 23:13:52 -04:00
Martin Konecny 366ea78fce CC-3532: Now Playing GUI-> Progress bar is still playing after end of show 
-fixed
 2012-04-03 18:29:36 -04:00
Martin Konecny 2e88801dad CC-3562: NOWPlaying->Overbooked Show1 introduces problems to itself and to the next 
-fixed
 2012-04-02 17:28:05 -04:00
Naomi Aro 9e9ae11725 CC-3551 : Change Cue Out for currently deleted track 2012-03-30 12:24:55 +02:00
James 5b65b56b93 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-29 16:57:49 -04:00
James 7325d51ada CC-3449: Live Stream: Kick out live dj at the end of the show 
- fixed so airtime sends series of kick_out events according to
cached_ahead value in cfg file.
 2012-03-29 16:57:28 -04:00
Naomi Aro cea37774ca CC-3551 : Change Cue Out for currently deleted track 2012-03-29 19:20:02 +02:00
Naomi Aro 5a24331ef6 CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. 2012-03-29 17:37:18 +02:00
James 4f5d7efaa1 CC-3449: Live Stream: Kick out live dj at the end of the show 
- done
 2012-03-28 15:12:01 -04:00
Naomi Aro 296a5c583a CC-3407 : Timeline: Display if tracks are missing on disk 2012-03-27 15:16:07 +02:00
Martin Konecny 1a4e6c563b cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Martin Konecny c301cd5256 cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
James 1ccf63ab0b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-22 16:24:38 -04:00
James f8d3a8c8bb CC-3449: Live Stream: Kick out live dj at the end of the show 
- PHP side implementation
 2012-03-22 16:23:59 -04:00
Naomi Aro 1fdb3cf163 CC-3360 : Timeline Css 
adding Css to timeline.
 2012-03-22 18:04:22 +01:00
Martin Konecny 9be6f1bd0e CC-3464: Playout forward cache should be configurable 
-Done
 2012-03-17 14:53:15 -04:00
Daniel 77e1c1c0cb CC-3466: Select statement for Now Playing has 'AND' in statement when no shows scheduled. 
-added check to make the code do nothing when a previous, current and next show id aren't specified.
 2012-03-16 17:13:32 -04:00
Daniel 8a34023336 CC-3465: Now playing should show tracks over shows for previous and next 
- added logic to include previous and next show in schedule query so the now playing bar will show the tracks from the show instead of the show itself.
 2012-03-16 14:02:53 -04:00
james 701ed82f40 CC-3224: "On-the-fly" stream rebroadcasting 
- interface implementation. subform within the show form.
 2012-03-14 14:41:00 -04:00
Daniel a65ea6d058 CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- updated the code to remove the empty declaration of $results
- updated parameters so the name has p_ prepended to it
- fixed a weird bug where $con was not sent to updateScheduleStatus
- modified previous element logic so I only store the index and after the loop test if it was set and then do the formating.
 2012-03-13 17:46:13 -04:00
Daniel 48c8607d17 CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song 
-added brackets around other if condition
 2012-03-13 11:34:43 -04:00
Daniel 13e3197ebf CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song 
- added brackets to an statement
 2012-03-13 11:31:24 -04:00
Daniel 1e4d34447a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Schedule.php
 2012-03-13 10:23:44 -04:00
Daniel cbaeda1d6b CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- Updated the logic in GetPlayOrderRange now I get the previous, current and next shows and tracks to be played.
- This information is then sent back to the caller.
	- if the previous track is null the previous show is sent back as an example of the algorithm.
 2012-03-13 10:21:01 -04:00
Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py
 2012-03-12 17:52:17 -04:00
Martin Konecny 0dfcb77f1a CC-3386: array access for "media_played" flag is hardcoded to 0 
-fixed
 2012-03-05 23:53:25 -05:00
Martin Konecny 9715de11f5 CC-3372: Improved pypo cache delete 
-Done
 2012-03-05 19:02:46 -05:00
Martin Konecny df22ab21a6 CC-3359: Now Playing -> Day view has a bug with supporting UTC time 
-fixed
 2012-03-02 16:32:16 -05:00
Naomi Aro f61afb0216 CC-3373 : Timeline: only lock the currently playing track and the one after 2012-03-02 14:01:02 +01:00
Naomi Aro 6c749075ac CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table 
chaning column name to playout_status
 2012-03-02 12:22:08 +01:00
Martin Konecny d03d01bce9 CC-3366: Pypo: Use local files instead of downloading them 
-done
 2012-03-01 18:00:46 -05:00
Naomi Aro 3bfbe036c7 CC-3174 : showbuilder 
using the new status column in cc_schedule to colour boundary/overbooked tracks.
 2012-03-01 15:09:13 +01:00
Daniel 1deee3cb65 CC-3365: Airtime API returns a non-null value for next item when there is no next item. 
- Improved check for determining if there is another element in the result set which is used to compute the next value.
 2012-02-29 14:54:54 -05:00
Martin Konecny a6413f2d1a CC-3336: Refactor schedule API used by pypo 2012-02-28 22:33:19 -05:00
Martin Konecny 497715df44 Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo 
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
 2012-02-28 19:22:13 -05:00
Martin Konecny 11f31effca CC-3336: Refactor schedule API used by pypo 2012-02-28 15:04:24 -05:00
Martin Konecny a53d856e8d CC-3336: Refactor schedule API used by pypo 
-add comment
 2012-02-28 14:56:21 -05:00
Martin Konecny 99c24ed038 CC-3336: Refactor schedule API used by pypo 
-removed export_source
-rewrote GetScheduledPlaylists()
 2012-02-28 14:52:44 -05:00
Martin Konecny 322d1bfa99 CC-3336: Refactor schedule API used by pypo 
-initial commit
 2012-02-28 14:43:39 -05:00
Martin Konecny 413d669bbf Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo 
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py

-weird conflict. I must have committed while I had my changes git-stash'ed
 2012-02-28 13:58:10 -05:00
Daniel fc2b18923e CC-3337: Optimize Schedule/get-current-playlist/format/json 
- I've updated the time interval used to search for the next, current and previously secheduled shows to 24 hours before and after from 1 hour.
 2012-02-27 18:09:30 -05:00
Naomi Aro 43d67c921d CC-3174 : showbuilder 
adding cue/fade columns to table

fixing schedule fade out
putting default fade between files not in a playlist.
 2012-02-27 21:29:02 +01:00
Martin Konecny e8f329aef1 CC-3336: Refactor schedule API used by pypo 2012-02-27 13:52:35 -05:00
Martin Konecny 4631e199cc CC-3336: Refactor schedule API used by pypo 
-add comment
 2012-02-23 15:20:25 -05:00
Martin Konecny c433b08158 CC-3336: Refactor schedule API used by pypo 
-removed export_source
-rewrote GetScheduledPlaylists()
 2012-02-23 15:20:25 -05:00
Martin Konecny bb300676cf CC-3336: Refactor schedule API used by pypo 
-initial commit
 2012-02-23 15:20:24 -05:00
Martin Konecny da012af6ed CC-3336: Refactor schedule API used by pypo 
-removed export_source
-rewrote GetScheduledPlaylists()
 2012-02-22 20:41:24 -05:00
Martin Konecny c5c1dce4d6 CC-3336: Refactor schedule API used by pypo 
-initial commit
 2012-02-22 17:29:49 -05:00
Daniel 80e33ee533 CC-3337: Optimize Schedule/get-current-playlist/format/json 
- I've updated the logic to query the cc_schedule table directly for the previous, next, current shows which makes look up time much faster. If that doesn't work then I revert back to the previous logic, incase nothing is scheduled within an hour of the current time.
 2012-02-22 11:36:48 -05:00
Daniel c7f4b17e81 CC-3331: Optimize "Now Playing" to load in less than 1/2 second 
- cleaned up sql statement Schedule's getScheduleItemsInRange
 2012-02-17 17:08:47 -05:00
Daniel 5cb99e9532 CC-3331: Optimize "Now Playing" to load in less than 1/2 second 
- Reorganized the now playing to find all the scheduled items within two time frames instead of in a loop per show id.
- I've cut the time in half
 2012-02-17 16:47:12 -05:00
Naomi Aro e1d5d6de73 CC-3174 : showbuilder 
checking modification time before deleting items.
Throws a ScheduleOutdatedException
 2012-02-16 16:29:11 +01:00
Naomi Aro b1fbeeb448 CC-3174 : showbuilder 
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
 2012-02-15 00:39:27 +01:00
Naomi Aro b7b1c401f6 CC-3174 : showbuilder 
fixing classes on show footer, selector for the select all.
only adding a checkbox on a row if a user is allowed to schedule there.
 2012-02-14 13:33:25 +01:00
Naomi Aro fdd962f5ce CC-3174 : showbuilder 
replacing context menus on calendar screen.
 2012-02-09 21:19:21 +01:00
Naomi Aro aa7afce245 CC-3174 : showbuilder 
modifying times to work with scheduling times.
 2012-02-07 17:29:52 +01:00
Naomi Aro 8212624c4a CC-3174 : showbuilder 
fixed moving an item to an earlier position in a show,
timeline needs a width or connected list doesn't work.
place holder still has problems with floats.
 2012-02-06 01:51:22 +01:00
Naomi Aro fbda0e733b CC-3174 : showbuilder 
check into issue that propel doesn't return DateTime object in UTC.
using table tools to keep track of selected rows.
 2012-01-31 18:59:27 +01:00
Naomi Aro f5761fd03c CC-3174 : show builder 
status icon on left side of table
static check mark in the footer currently
 2012-01-26 19:10:37 +01:00
Naomi Aro b0c3bace1c CC-3174 : show builder 
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
 2012-01-26 15:21:04 +01:00
Naomi Aro ecaebbeb67 CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones. 2012-01-23 19:07:07 +01:00
Martin Konecny a0217f715f CC-3037: Nowplaying bar not showing current show 
-fixed
 2011-11-15 16:10:45 -05:00
Martin Konecny 20fc49b7be CC-3027: Current Show progress bar is wrong 
-looks like it's working.
 2011-11-12 00:04:37 -05:00
Martin Konecny 5a83c5b81e Merge branch '1.9.1' into devel 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
 2011-10-14 01:38:52 +02:00
Martin Konecny d8bcb3f03d CC-2972: Find better way to determine domain which pypo should download from. 
-Done
 2011-10-14 00:07:53 +02:00
martin 9e6a1ebf44 CC-2833: Use ClassLoaders for PHP Files 
-autoload DateHelper class
 2011-09-26 15:29:12 -04:00
martin 1e9a8a28fe CC-2833: Use ClassLoaders for PHP Files 
-Done for class Schedule and ScheduleGroup
 2011-09-23 16:50:00 -04:00
martin 1dd78d0584 CC-2833: Use ClassLoaders for PHP Files 
-Found out ClassLoaders only want one class per file. Moved
 ShowInstance class to its own .php file.
-Merged Show_DAL class into Show class
 2011-09-23 12:33:28 -04:00
martin 2be0960ed5 CC-2833: Use ClassLoaders for PHP Files 
-made MusicDir, Playlist and StoredFile autoload
 2011-09-22 12:24:17 -04:00
martin 62f0d1c7b2 Merge branch '1.9.1' into devel 2011-09-17 12:37:15 -04:00
martin d824eb7622 CC-2837: Invalid SQL statement 
-fixed
 2011-09-17 12:36:35 -04:00
James 903c3474c7 CC-2654: Remove abilities that don't apply to SaaS 
- not displaying manage folder option when saas is true
- not displaying record and rebroadcast section when saas is true
 2011-09-02 15:24:35 -04:00
james 56ad8c6b3d Merge branch '1.9.1' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
 2011-08-26 12:56:10 -04:00
martin 7cfde811c9 CC-2729: Items in a playlist delivered from the server via JSON aren't in the proper order 
-fixed
 2011-08-24 18:13:50 -04:00
martin 846e08699e CC-2628: update a repeated show start time cause the show to get corrupted 
-disabled dragging + dropping repeated show instances
 2011-08-18 18:13:43 -04:00
martin 266ee56d6d CC-2683: All times in the database are not stored in UTC. 
-missed a spot where we need to use calculate in UTC
 2011-08-17 16:35:03 -04:00
martin 41fd5f2543 cc-2683: not using utc time 
-context menu showing options display correctly
-edit show fills in correctly
-Now Playing view shows up correctly
 2011-08-16 15:07:55 -04:00
Naomi Aro 9de0d490d8 CC-2569 : Scheduling a rebroadcast show uses old file length access 
use new metadata key access.
 2011-07-19 12:37:06 +02:00
martin 1416274882 CC-2529: Create download file API key 
-users who are authenticed via ZEND_AUTH can now preview files
 without using api-key
 2011-07-12 14:09:40 -04:00
martin d03cf4ca14 CC-2482: Next Song/Previous song can still be incorrect in some rare cases 
-should be fixed.
 2011-06-29 14:40:56 -04:00
james 05dc48fa71 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
 2011-06-20 18:09:37 -04:00
martin ec6db96025 cc-2015: on reboot resume show 
-use native capabilities of liquidsoap cue-in cue-out
 for song cue-in/cue-out
 2011-06-16 18:59:15 -04:00
martin e5ed11ee51 cc-2015: on reboot resume show 
-removed cue file from pypo responibility
 2011-06-16 13:26:37 -04:00
martin 0d13b9013b cc-2015: on reboot resume show 
-calculating the amount of seconds since track began complete
 2011-06-16 13:26:36 -04:00
james cf654f1a45 CC-1724:phone-home-statistics 
Rebase from devel into this branch
 2011-06-15 12:06:50 -04:00
james 061dec14aa CC-2289:Differentiate between time and duration 
- modified createNewFormSections function so it populate form
with defalt value
 2011-06-13 14:20:57 -04:00
martin 1540e593e4 Merge branch '1.8.2' into devel 
Conflicts:
	airtime_mvc/application/models/Dashboard.php
	python_apps/media-monitor/airtime-media-monitor-start
	python_apps/pypo/airtime-pypo-start
	python_apps/show-recorder/airtime-show-recorder-start
 2011-06-03 17:29:55 -04:00
martin eee885f746 cc-2344: wrong song displayed 
-removed unnecessary code.
 2011-06-03 17:06:47 -04:00
martin e69f9497ed cc-2344: wrong song displayed 
-fixed #2
 2011-06-03 17:03:11 -04:00
martin c9c9ecf2cd cc-2344: wrong song displayed 
-fixed
 2011-06-03 16:36:13 -04:00
martin e969baee1c cc-2359: record check box is disabled after update show 
-fixed
 2011-06-03 14:01:58 -04:00
martin b747ce6fb0 cc-2344: wrong song displayed 
-fixed
 2011-06-02 12:45:57 -04:00
martin bc640d38f2 cc-2167-top-panel-doesn't-list-recording-shows 2011-05-10 19:06:35 -04:00
mkonecny 9638f6dd3e cc-2167: now playing view with recording shows a gap 
-implemented
 2011-05-05 16:45:13 -04:00
Paul Baranowski eb76bbe7f0 Merge branch 'master' of dev.sourcefabric.org:airtime 
Conflicts:
	VERSION
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Shows.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/user/remove-user.phtml
	airtime_mvc/public/js/airtime/schedule/add-show.js
	airtime_mvc/public/js/airtime/schedule/schedule.js
	install/airtime-upgrade.php
	install/include/AirtimeInstall.php
	python_apps/api_clients/api_client.py
	utils/airtime-clean-storage
	utils/airtime-clean-storage.php
	utils/airtime-import
	utils/airtime-import.php
 2011-04-25 17:24:53 -04:00
Paul Baranowski 07633ea249 CC-2225 airtime-clean-storage doesnt work 
CC-2224 airtime-import checks if you can write to the stor directory even if you are linking

Had to rewrite the airtime-clean-storage script.
 2011-04-25 16:48:34 -04:00
martin e48f044e56 -CC-2192: Schedule sent to pypo is not sorted by start time. 2011-04-15 12:26:59 -04:00
Paul Baranowski b11cbd8159 CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00