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

6523 Commits

Author SHA1 Message Date
Martin Konecny db4c916d9a -add support for PyDev code analysis (need to make pypo directory a package) 2012-03-17 13:56:41 -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 275fc7f987 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-16 20:40:05 -04:00
Martin Konecny 4d96a16cbe -comment out unused function in pypo-fetch 2012-03-16 20:39:49 -04:00
Daniel ece35541e6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-16 18:03:50 -04:00
Daniel 7914b30233 CC-3429: Firefox does not natively support mp3 file playing so preview does nothing. 
- after reading about the trick foudn in Mark Panaghiston's posting from this link https://groups.google.com/forum/#!topic/jplayer/gTJrSCjwftw
- the current imperfect solution for firefox sould be to show a video jplayer that can play all the audio types.
 2012-03-16 18:03:35 -04:00
martin 261881cd96 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-16 17:36:46 -04:00
martin 0b02009a0e -maintenance on liquidsoap_compile script. Add a configuration file 
-make it work with releases from hg repository (previously only worked with official 1.0.0 liquidsoap release)
 2012-03-16 17:36:27 -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
Martin Konecny 067cd1280a -remove some annoying logging info from pypopush 2012-03-16 00:49:08 -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
Martin Konecny 335f3a9dfe Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-16 00:00:07 -04:00
Martin Konecny 18bcdc5157 -useful utility to compare database to filesystem 2012-03-15 23:59:36 -04:00
Martin Konecny 0716e0425c -Media monitor not handling unicode incorrectly or comparing UTF-8 with unicode 2012-03-15 23:28:47 -04:00
James 5156f8067e CC-3452: Live Stream: DJs assigned to the show and Program Managers should be 
able to control switches and able to kick out connection

- refactoring code
 2012-03-15 20:52:22 -04:00
Daniel 5b953443c6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/public/js/airtime/showbuilder/builder.js
 2012-03-15 18:12:15 -04:00
Daniel ae0d3c560c CC-3394: Add play button to timeline table. 
- added image information to row in ShowBuilder.php to enable audio preview of shows.
- moved around code so the audio preview functionaly is standalone
- fixed the firefox bug for issue CC-3429
 2012-03-15 17:56:51 -04:00
james 559acfd5a1 CC-3452: Live Stream: DJs assigned to the show and Program Managers should be 
able to control switches and able to kick out connection

- refactoring code
 2012-03-15 14:33:59 -04:00
james 04c2c2f920 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-15 14:29:48 -04:00
james 4595da9087 CC-3452: Live Stream: DJs assigned to the show and Program Managers should 
be able to control switches and able to kick out connection

- kickout buttons and switch buttons are now visible to everyone.
- clicking buttons without correct permission will return proper error msg.
 2012-03-15 14:29:31 -04:00
Naomi Aro 6409003b3f CC-3174 : showbuilder 
putting qtip on missing file alert.
 2012-03-15 16:29:52 +01:00
Naomi Aro 7a8398bd32 CC-3174 : showbuilder 
including context menu to delete items from timeline.
 2012-03-15 16:11:29 +01:00
Naomi Aro 2beadc9301 CC-3174 : showbuilder 2012-03-15 14:14:02 +01:00
Naomi Aro fa1f03ed58 CC-3174 : showbuilder 
improving look of playlist when files are not on disk.
 2012-03-15 12:08:29 +01:00
Naomi Aro 3019cb9c42 CC-3434 : playlist 
changing image to be smaller.
 2012-03-15 11:37:20 +01:00
Naomi Aro ae646545c4 CC-3201 : file import more visible 2012-03-15 11:36:32 +01:00
Martin Konecny 39a41f40ed Merge branch 'cc-2675-edit-ongoing-show' of dev.sourcefabric.org:airtime into cc-2675-edit-ongoing-show 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
 2012-03-14 15:48:57 -04:00
Martin Konecny cca3995dba cc-2675: edit ongoing show 
-almost there?
 2012-03-14 15:37:04 -04:00
Martin Konecny 217be89766 cc-2675: Edit ongoing show 
-progress being made
 2012-03-14 15:37:04 -04:00
Martin Konecny 1d1405f7fd CC-2675: Edit ongoing show 
-initial commit
 2012-03-14 15:37:04 -04:00
James 03c8c10ba1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-14 15:26:26 -04:00
James 16c0756d76 CC-3224: "On-the-fly" stream rebroadcasting 
- css fix
 2012-03-14 15:26:07 -04:00
Naomi Aro 94e5a3d423 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-14 20:10:22 +01:00
Naomi Aro 68a4443c36 CC-3174 : showbuilder 
changing get to post.
 2012-03-14 20:10:10 +01: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 2ee4b227fc CC-3439: Live Stream: Only admin should be able to turn on/of switch and 
able to see kick out button

- done
 2012-03-14 14:43:11 -04:00
James 06e810c35d CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch 
status when it restarts

- missed one file from previous commit
 2012-03-14 14:43:10 -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 e31ac81e74 CC-3418: Live Stream: Merge current "On-Air" indicator and "Listen" 
button with new stream source indicator

- Initial commit
 2012-03-14 14:43:10 -04:00
James 68fa46f017 CC-3415: Live Stream: Disconnect all input.harbor connections before 
terminating the process

- call prepare termiate on monit-restart()
 2012-03-14 14:43:10 -04:00
James cde6db812f CC-3415: Live Stream: Disconnect all input.harbor connections before 
terminating the process

- Modified init.d script. init.d script calls liquidsoap_prepare_terminate.py
 2012-03-14 14:43:10 -04:00
James 79f8eabe2b CC-3405: Display to users how to connect a live stream to Airtime 
- Done
 2012-03-14 14:43:10 -04:00
James 540f262a77 CC-3224: "On-the-fly" stream rebroadcasting 
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
 2012-03-14 14:43:10 -04:00
James efee025691 CC-3406: Live Stream: Switch off live sources on disconnection 
- 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 d4a387e113 - adding switch to liquidsoap 2012-03-14 14:41:00 -04:00