Martin Konecny
0a3c9c7351
clean up indentation + imports for python apps
2012-06-26 22:41:11 -04:00
Martin Konecny
27a6326c58
Merge branch '2.1.2' into 2.1.x
...
Conflicts:
python_apps/pypo/pypofetch.py
2012-06-18 14:57:22 -04:00
Martin Konecny
ff35322ae9
CC-3988: Pypo: pypo doesn't update last schedule update time when pyp…
2012-06-17 23:24:15 -04:00
James
53af1928cf
CC-3988: Pypo: pypo doesn't update last schedule update time when pypo pulls
...
schedule from the server
- fixed
2012-06-15 21:31:08 -04:00
James
0040f29fd2
CC-3953: Airtime will not auto query for new schedule after 1 hour if it
...
received new messages unrelated to schedule in the meantime
- fixed
2012-06-08 14:57:59 -04:00
Martin Konecny
fb715b135c
regenerate liquidsoap.cfg if it doesn't exist
2012-05-28 14:27:30 -04:00
Martin Konecny
08c20cff10
CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
...
-add UTF-8 header everywhere...
2012-05-14 16:09:49 -04:00
Martin Konecny
dae8682e51
CC-3691: Pypo needs to write stderr + stdout to the log file
...
-fixed
2012-04-20 19:12:36 -04:00
Martin Konecny
26be52c459
CC-3462: If destination file already exists in pypo cache, double check if it's the correct file size
...
-had two copy functions :S
2012-04-13 15:23:01 -04:00
denise
d06b3573e9
CC-3623: Need to send show name to Liquidsoap. (Currently sending name as "TODO")
...
-fixed
2012-04-11 19:22:47 -04:00
James
1f5f5057bf
CC-3430: Live Stream: Admin should be able to kick out the source connection
...
- fixed
2012-04-11 16:20:27 -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
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
james
f4b9774b08
CC-3535: PypoFetch: make disconnect_source() and switch_source() static method
...
- done
2012-03-28 09:39:46 -04:00
James
ef801c7a10
CC-3484: Pypo: On bootup, it should grab station name and stream label
...
for liquidsoap
- fixed
2012-03-26 17:44:07 -04:00
James
b4e9f9699c
CC-3483: Live Stream: default fade in/out for live stream transition
...
- take care of bootstrap of pypo
2012-03-20 22:29:52 -04:00
James
6b768c2f99
CC-3483: Live Stream: default fade in/out for live stream transition
...
- done. changing fade value doesn't require LS to restart
2012-03-20 22:16:17 -04:00
James
d4142f8b8b
CC-3484: Pypo: On bootup, it should grab station name and stream
...
label for liquidsoap
- fixed
- created new function set_bootstrap_variables()
2012-03-20 16:41:15 -04:00
Martin Konecny
6166d1d590
-updated comment in pypofetch
2012-03-18 00:38:39 -04:00
Martin Konecny
22cc362f1c
CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore
...
-done
2012-03-17 23:51:58 -04:00
Martin Konecny
7a7eb02de5
-fix errors pointed out by pydev code completion
2012-03-17 14:16:11 -04:00
Martin Konecny
903698efc5
CC-3470: Smarter way for pypo to recover when it should be playing something.
...
-fixed
2012-03-17 13:55:56 -04:00
Martin Konecny
6634e9f663
cc-3447: synchronize access to liquidsoap via telnet
...
-add another critical section
2012-03-16 20:47:46 -04:00
Martin Konecny
c8c9e46228
cc-3447: pypo telnet class
2012-03-16 20:41:50 -04:00
Martin Konecny
4d96a16cbe
-comment out unused function in pypo-fetch
2012-03-16 20:39:49 -04:00
Martin Konecny
79964186ed
CC-3462: If destination file already exists in pypo cache, double...
...
-done
2012-03-16 00:48:39 -04:00
James
c5c9fd7ba8
CC-3430: Live Stream: Admin should be able to kick out the source connection
...
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
2012-03-14 14:43:11 -04:00
James
3c6aff093e
CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch status
...
when it restarts.
- Pypo contacts airtime on bootup and ask what the last switch status was
2012-03-14 14:43:10 -04:00
James
4eefc05366
CC-3427: Live Stream: Ability to switch off Scheduled Play
...
- done
2012-03-14 14:43:10 -04:00
James
f193047a1c
CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
...
are connected and give user the ability to block those streams
- added stream source switch interface
- backend code
2012-03-14 14:43:10 -04:00
James
128a497059
CC-3224: "On-the-fly" stream rebroadcasting
...
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
James
30901aa0d6
CC-3224: "On-the-fly" stream rebroadcasting
...
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
2012-03-14 14:41:00 -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
9715de11f5
CC-3372: Improved pypo cache delete
...
-Done
2012-03-05 19:02:46 -05:00
Martin Konecny
d03d01bce9
CC-3366: Pypo: Use local files instead of downloading them
...
-done
2012-03-01 18:00:46 -05:00
Martin Konecny
92f19139b9
CC-3336: Refactor schedule API used by pypo
...
-done
2012-02-29 21:27:42 -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
b572b26b68
CC-3336: Refactor schedule API used by pypo
...
-make sure that empty arrays are objects and not arrays
-clean up some comments
2012-02-28 15:32:18 -05:00
Martin Konecny
11f31effca
CC-3336: Refactor schedule API used by pypo
2012-02-28 15:04:24 -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
James
d4cdac505a
CC-3346: Recorder: Merge recorder with pypo
...
- fixed log message
2012-02-28 14:45:18 -05:00
James
5aabe89069
CC-3346: Recorder: Merge recorder with pypo
...
- separated rabitMQ listener part out from pypoFetch and created
pypomessagehandler.py
Conflicts:
python_apps/pypo/pypofetch.py
2012-02-28 14:44:39 -05:00
james
91ef7f7669
CC-3346: Recorder: Merge recorder with pypo
...
- function parse_show was renamed to process_recorder_schedule
- using thread on self.process_schedule call
2012-02-28 14:42:43 -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
James
33b6c2a390
CC-3346: Recorder: Merge recorder with pypo
...
- fixed log message
2012-02-27 18:09:07 -05:00
James
f030cf4f67
CC-3346: Recorder: Merge recorder with pypo
...
- separated rabitMQ listener part out from pypoFetch and created
pypomessagehandler.py
2012-02-27 16:18:10 -05:00
Martin Konecny
e8f329aef1
CC-3336: Refactor schedule API used by pypo
2012-02-27 13:52:35 -05:00
james
38c16df138
CC-3346: Recorder: Merge recorder with pypo
...
- function parse_show was renamed to process_recorder_schedule
- using thread on self.process_schedule call
2012-02-25 09:44:33 -05:00
James
f92c425890
CC-3345: Enter unusable state when liquidsoap value has an '='
...
character in it.
- fixed
2012-02-24 14:14:42 -05:00