Commit Graph

772 Commits

Author SHA1 Message Date
Rudi Grinberg e98eda144a cc-4105: removed naive replaygain again. added micro optimization to Insert into cc_files 2012-08-14 14:50:41 -04:00
Rudi Grinberg 6981a5cb49 cc-4105: added truncation of BPM to prevent crashes 2012-08-14 14:50:40 -04:00
Rudi Grinberg ba03447946 cc-4105: added handling for pyinotify events and create more logical events 2012-08-14 14:50:39 -04:00
Rudi Grinberg 688d22e995 cc-4105: fixed metadata formatting bug 2012-08-14 14:50:39 -04:00
Rudi Grinberg 6e9db647c1 cc-4105: Fixed metadata handling. Added more error reporting to rmq requests 2012-08-14 14:50:39 -04:00
Rudi Grinberg 5f1024bb7d cc-4105: Tweaked config params. Fixed error checking. Fixed unicode stuff. Removed redundant php 2012-08-14 14:50:39 -04:00
Rudi Grinberg 7abe882455 cc-4105-2: added retries on failed requests. added ignored files set like in the old media monitor 2012-08-14 14:50:39 -04:00
Rudi Grinberg 3422eb3cc0 cc-4105: added event packing to event objects 2012-08-14 14:50:39 -04:00
Rudi Grinberg 9964c826ab cc-4105: Added problem dir moving. Also locale config from old media monitor 2012-08-14 14:50:37 -04:00
Martin Konecny 7a5d9a0f91 CC-1665: Scheduled stream rebroadcasting and recording
-don't require 2 digits for minutes or hours
2012-08-13 15:26:32 -04:00
Martin Konecny c3862d69e5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-13 14:58:20 -04:00
Martin Konecny 51e242ec7f CC-1665: Scheduled stream rebroadcasting and recording
-remove edit menu from show builder
2012-08-13 14:58:11 -04:00
Martin Konecny b8ea08c065 CC-1665: Scheduled stream rebroadcasting and recording
-analyze stream mime type and report error as needed.
2012-08-13 12:59:26 -04:00
James dad8762f4f CC-4209: Smart Playlist: 'Processing' wont disappear after clicking Generate during 'File import in progress'
- fixed
2012-08-13 12:31:49 -04:00
Martin Konecny 028f6636dd CC-1665: Scheduled stream rebroadcasting and recording
-fix right clicking in playlist builder to view metadata causing exception
2012-08-10 14:37:32 -04:00
Martin Konecny fa749c58f0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-10 12:40:45 -04:00
Martin Konecny 35e3b3bc02 CC-1665: Scheduled stream rebroadcasting and recording
-use mime type so that webstreams can play with invalid filenames
2012-08-10 12:40:28 -04:00
James 4009ae741f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-10 12:39:45 -04:00
James 8b13af2e04 fix bug on widget 2012-08-10 12:14:15 -04:00
denise bd966915ee CC-4207: Smart Playlists: Criteria is lost on 'Shuffle' click
-fixed
2012-08-10 11:56:01 -04:00
Martin Konecny fe3f4ea678 CC-1665: Scheduled stream rebroadcasting and recording
-capture stream mime type and store in db.
2012-08-10 00:57:03 -04:00
denise 5a63a284c8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 18:24:32 -04:00
denise 10ea825536 CC-4201: Playlist Builder -> Smart Playlist: DJ user can edit SP created by others in particular situation
-fixed
2012-08-09 18:24:22 -04:00
Martin Konecny 65cb34db4a CC-1665: Scheduled stream rebroadcasting and recording
-webstream preview on show builder working
2012-08-09 18:14:53 -04:00
James 63a51081c1 CC-4182: Media Library -> Smart Playlist: Empty box appears after left clicking a Dynamic Smart Playlist created by other users, when login as DJ
- fixed
2012-08-09 17:50:43 -04:00
Martin Konecny bc72a6743b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 17:42:32 -04:00
Martin Konecny 4129900858 CC-1665: Scheduled stream rebroadcasting and recording
-step 1 of getting stream preview on show builder working
2012-08-09 17:42:25 -04:00
denise f75cf5ffe2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 17:24:00 -04:00
denise e674654cb1 CC-4192: Smart Playlist Builder: make save button save title, description, and criteria
-done
2012-08-09 17:23:52 -04:00
James 618813ebc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 16:59:33 -04:00
James 6c721cd68d CC-4184: Playlist Builder : Error alert for trying to add Web Stream to Smart Playlist
- fixed
- extra fix: context menu for webstream
2012-08-09 16:59:18 -04:00
Martin Konecny c73328e297 CC-1665: Scheduled stream rebroadcasting and recording
-ability to preview webstreams inside of playlists
2012-08-09 16:49:20 -04:00
Martin Konecny 952f18dc3c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-09 14:39:42 -04:00
Martin Konecny b53bc36f4f CC-1665: Scheduled stream rebroadcasting and recording
-ability to preview webstreams
2012-08-09 14:39:31 -04:00
James ae5b6e58d7 CC-4144: Playlist Builder: Adding smart playlist into regular playlist will reset the Fade in/out settings to default value
- fixed
2012-08-09 11:03:57 -04:00
Martin Konecny c69dac7ab6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-08 23:02:39 -04:00
Martin Konecny d0d70db391 remove useless debugging 2012-08-08 23:02:16 -04:00
James d1e6f8178b CC-4166: Playlist Builder -> Regular Playlist : clicking Fade in/out button for a empty playlist will cause PHP Fatal Error
- fixed. Not displaying fade setting button if the playst/smartplaylist
is empty.
2012-08-08 15:29:09 -04:00
Martin Konecny 48a1bf3f02 Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
2012-08-06 17:10:46 -04:00
Martin Konecny 40023d9086 CC-4152: Widget does not display current show in some modes
-fixed
2012-08-06 17:07:18 -04:00
Martin Konecny f901e13a84 CC-1665: Scheduled stream rebroadcasting and recording
-Make playlist builder show creator name instead of creator id
2012-08-03 18:06:47 -04:00
Martin Konecny 0ea66fc33f CC-1665: Scheduled stream rebroadcasting and recording
-ability to edit playlists
2012-08-03 15:59:34 -04:00
denise 361e681a59 CC-84: Smart Playlists
- remove 'add to playlist' option on showbuilder screen
2012-08-02 16:50:35 -04:00
James 028e089c82 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/models/Block.php
2012-08-02 16:37:12 -04:00
James 0d2d8218bf CC-84: Smart Playlists
- audio preview on playlist
- cleaning up some code
2012-08-02 16:36:12 -04:00
Martin Konecny a146fdcd37 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-02 16:27:00 -04:00
Martin Konecny 9cc152c0ae CC-1665: Scheduled stream rebroadcasting and recording
-validate form fields of new webstream
2012-08-02 15:45:15 -04:00
denise 997b5c31c3 CC-84: Smart Playlists
- fixed dragging tracks into playlists (smart and dumb)
- display alert when dragging into dynamic block
- display alert when dragging playlist into block
2012-08-02 11:52:11 -04:00
Martin Konecny b9bb87f69d CC-1665: Scheduled stream rebroadcasting and recording
-clicking save now show's webstream save was successful
2012-08-01 15:37:50 -04:00
denise c9afac239a CC-84: Smart Playlists
- add qtip for smart playlists
- modified qtip content for regular playlists that contain smart playlists
2012-08-01 12:04:48 -04:00