Permalink
Browse files

Upload to check its OK

  • Loading branch information...
KenT2 committed Apr 9, 2013
1 parent a76326a commit c84500cd5cf0c29ae18bdcd21b76549af27c95e0
Showing with 8,751 additions and 0 deletions.
  1. +30 −0 ReleaseNotes.txt
  2. +91 −0 changelog.txt
  3. +16 −0 licence.md
  4. BIN manual.pdf
  5. +100 −0 new_examples/pp_audio/media.json
  6. +49 −0 new_examples/pp_audio/pp_showlist.json
  7. +27 −0 new_examples/pp_concurrent/audio.json
  8. +48 −0 new_examples/pp_concurrent/media.json
  9. +86 −0 new_examples/pp_concurrent/pp_showlist.json
  10. +86 −0 new_examples/pp_timeofday/pp_showlist.json
  11. +32 −0 new_examples/pp_timeofday/show1.json
  12. +38 −0 new_examples/pp_timeofday/showb.json
  13. +467 −0 pipresents.py
  14. +675 −0 pp_audioplayer.py
  15. +183 −0 pp_definitions.py
  16. +1,091 −0 pp_editor.py
  17. +431 −0 pp_gpio.py
  18. +162 −0 pp_home/gpio.cfg
  19. +16 −0 pp_home/pp_profiles/pp_profile/media.json
  20. +49 −0 pp_home/pp_profiles/pp_profile/pp_showlist.json
  21. +12 −0 pp_home/pp_profiles/ppt_blank/pp_showlist.json
  22. +16 −0 pp_home/pp_profiles/ppt_exhibit/media.json
  23. +49 −0 pp_home/pp_profiles/ppt_exhibit/pp_showlist.json
  24. +22 −0 pp_home/pp_profiles/ppt_interactive/media.json
  25. +22 −0 pp_home/pp_profiles/ppt_interactive/menu.json
  26. +83 −0 pp_home/pp_profiles/ppt_interactive/pp_showlist.json
  27. +4 −0 pp_home/pp_profiles/ppt_liveshow/liveshow.json
  28. +44 −0 pp_home/pp_profiles/ppt_liveshow/pp_showlist.json
  29. +16 −0 pp_home/pp_profiles/ppt_mediashow/media.json
  30. +49 −0 pp_home/pp_profiles/ppt_mediashow/pp_showlist.json
  31. +22 −0 pp_home/pp_profiles/ppt_menu/media.json
  32. +46 −0 pp_home/pp_profiles/ppt_menu/pp_showlist.json
  33. +16 −0 pp_home/pp_profiles/ppt_presentation/media.json
  34. +49 −0 pp_home/pp_profiles/ppt_presentation/pp_showlist.json
  35. +70 −0 pp_home/resources.cfg
  36. +387 −0 pp_imageplayer.py
  37. +578 −0 pp_liveshow.py
  38. +1 −0 pp_log.log
  39. +308 −0 pp_medialist.py
  40. +710 −0 pp_mediashow.py
  41. +469 −0 pp_menushow.py
  42. +197 −0 pp_messageplayer.py
  43. +154 −0 pp_mplayerdriver.py
  44. +150 −0 pp_omxdriver.py
  45. +38 −0 pp_options.py
  46. +41 −0 pp_resourcereader.py
  47. +211 −0 pp_showlist.py
  48. +259 −0 pp_timeofday.py
  49. +69 −0 pp_utils.py
  50. +472 −0 pp_validate.py
  51. +510 −0 pp_videoplayer.py
View
@@ -0,0 +1,30 @@
Version 1.2.1 beta 1
MPlayer must now be installed before using Pi Presents - sudo apt-get install mplayer
This version has many new fields so the version number has increased from 1.1 to 1.2
* This version of Pi Presents will not run shows prepared under previous versions of pp_editor
* Using the editor on a previous version of a profile will automatically upgrade the profile to the current version HOWEVER SEE BELOW!!!
* There is one change you might have to do manually. If you used PIR as the trigger for a mediashow change the 'Start Trigger' field to GPIO and enter PIR into the 'trigger input' field.
There is a simplified way to do fullscreen so the --fullscreen (-f) command option now has no parameters. Also there is no need to edit the lxde-rc.xml file or change the taskbar to autohide. However if lxde-rc.xml is already edited just leave it it will not affect operation.
The Version 1.1.x examples use omxplayer to play audio tracks. MPlayer can now be used. To do this in this beta you will need to delete the track and re-create it.
In version 1.1.x at the end of a mediashow the screen went blank, this does not happen in version 1.2.1 as, in order to reduce the flicker between tracks I leave the previous track on display while displaying the next. You will need to add a 1 second blank message track if you want a blank screen.
This and future versions can potentially blow up your Pi as it controls the digital outputs. Until you are familiar with it I suggest ensuring all GPIO pins are disconnected when using Pi Presents.
Take care when modifying gpio.cfg, little error checking is done by Pi Presents
Enjoy, feedback welcome.
Version 1.1.2
On a Windows PC the editor did not reliably save medialists. I have added a workaround which asks the user to re-try the save it seems to always work on the second or third time.
unclutter must be installed before using Pi Presents (sudo apt-get install unclutter)
In my tests liveshow coped well with deleting tracks at any time. However I can see there are potential problems as files could be deleted at the moment they are being read. If you have problems please report them and I will improve the mutual exclusion.
Take care when modifying resources.cfg, little error checking is done by Pi Presents.
View
@@ -0,0 +1,91 @@
Version 1.2.1 beta 1 8/4/2013
Major improvements:
AUDIO PLAYER
New audioplayer which will play audio tracks without affecting the display, uses MPlayer
Audio tracks can be sent to left or right speakers or stereo.
Audio tracks can have associate images and text.
Volume of a track can be set.
ANIMATION and GPIO
New animation subsystem, turn GPIO on or off synchronised with tracks
GPIO is now fully configurable, assign pins to buttons, trigger inputs or animation outputs
TIME OF DAY TRIGGERS
Time of day triggers for liveshow and mediashow, start a show at a time of day, end a show after a period of time or at a time of day.
When waiting for time of day can display the time of the next show.
CONCURRENCY
Can now play two or more shows simultaneously
Control keys and buttons can be disable for chosen shows.
MESSAGES
Messages can now have background images or text.
FULL SCREEN
Simplified setup and use of fullscreen - thanks tjaehnel
SHUFFLE
Tracks in mediashow and liveshow can now be shuffled
VIDEOPLAYER
Provision in the editor for seamless looping (waiting for omxplayer to be upgraded)
Provision in editor for windowed videos (waiting for omxplayer to be upgraded)
Added .m4v to video types
Volume of a track can now be set
MEDIASHOW
Enhanced triggering - moving to the next track can now be triggered by GPIO
BUG FIXES
As version 1.1.2b
Improved implementation of possible fix for playing of videos crashing once in every few hours
version 1.1.2b - 7/4/2013
Fixed messages not being vertically centered in messageplayer
Fixed duration of displayed messages increasing, as well as increasing CPU occupancy with time
Possible fix for playing of videos crashing once in every few hours
version 1.1.2a - 19/2/2013
Fixed sorting of files in liveshow
version 1.1.2 - 12/2/2013
Liveshow can now take its tracks from two directories
Switched 'up' and 'down' cursor keys in mediashow to match other programs.
Corrected response to buttons especially in complex shows
in show error handling now exits cleanly.
Examples always use hdmi for audio
version 1.1.1b - 31/1/2013
Workaround for editor not reliably saving medialists when used on a Windows PC
version 1.1.1a - 28/1/2013
Fixed bug in Track> Add Dir
!!!! Editor does not reliably save medialists when used on a Windows PC !!!!!
Version 1.1.1 - 28/1/2013
Added a LiveShow capability, tracks can be dynamically uploaded using ftp while a show is running.
Editor now works on a PC.
Added resources.cfg that allows the administrative text that was displayed to customers to be modified.
Removed the -c command line argument as Pi Presents automatically detects where its code is.
Removed mouse pointer in fullscreen mode, requires unclutter to be installed (Thanks Azizar)
Added .wav and .ogg to audio files as they can be played by omxplayer.
Version 1.1.0 - 20/1/2013
Added validation of profiles - all fields except for fonts and colours are validated.
Added a system to check compatibiity between profiles, editor and Pi Presents. Uses first 2 digits of Version:
First digit - complete re-write.
Second digit - Incremented when profile definition has changed
Third digit - modifications that do not change the profile interface.
Images can now display a text overlay - show-text and track-text
Images can be paused using 'space', 'p' or spacebar
Reversed the polarity of PIR input as burglar alarm PIR's have nc connections.
New image and message tracks now have blank durations so they inherit from show by default.
Fixed bug in editor where add show and add track produced linked tracks.
Other minor improvements
Version 1.0 - 8/1/2013
First Issue
View
@@ -0,0 +1,16 @@
Pi Presents
-----------
Copyright (c) 2013, Ken Thompson. Contact for licencing: http://www.museumoftechnology.org.uk/form.php . For technical queries please use Github or RPi Forum.
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
This software is Careware. If you are using this software in a profit making situation please consider sharing some of those profits with the charity with which I am associated and which inspired Pi Presents. If you use Pi Presents as part of your product I would appreciate a charitable donation and reserve the right to charge a royalty, or impose further conditions.
* The Museum of Technology, a super little museum who are currenty building themselves a larger home.
http://www.museumoftechnology.org.uk Use the 'Donate Now' button.
Let us know at http://www.museumoftechnology.org.uk/form.php so we can thank you.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
View
BIN +288 KB manual.pdf
Binary file not shown.
@@ -0,0 +1,100 @@
{
"issue": "1.2",
"tracks": [
{
"background-colour": "red",
"background-image": "",
"duration": "10",
"message-colour": "white",
"message-font": "Helvetica 25 bold",
"text": "Demonstrates some of the audio capabilities of Pi Presents\n\nPress down cursor to move through the tracks.\n\nIn case you are wondering:\n* NTE is an audio magazine for the visually impaired.\n* Listen at www.ntexpress.org.uk\n* I am their webmaster.",
"title": "Intro",
"track-ref": "",
"type": "message"
},
{
"animate-begin": "",
"animate-clear": "no",
"animate-end": "",
"audio-speaker": "stereo",
"background-image": "",
"clear-screen": "no",
"duration": "0",
"location": "+/media/01.mp3",
"mplayer-audio": "hdmi",
"mplayer-other-options": "",
"mplayer-volume": "",
"title": "stereo HDMI",
"track-ref": "",
"track-text": "Playing Audio through HDMI in stereo",
"track-text-colour": "white",
"track-text-font": "arial 30 bold",
"track-text-x": "300",
"track-text-y": "100",
"type": "audio"
},
{
"animate-begin": "",
"animate-clear": "no",
"animate-end": "",
"audio-speaker": "stereo",
"background-image": "",
"clear-screen": "no",
"duration": "0",
"location": "+/media/01.mp3",
"mplayer-audio": "local",
"mplayer-other-options": "",
"mplayer-volume": "",
"title": "stereo local",
"track-ref": "",
"track-text": "Through the STEREO headphone socket",
"track-text-colour": "yellow",
"track-text-font": "arial 30 bold",
"track-text-x": "400",
"track-text-y": "700",
"type": "audio"
},
{
"animate-begin": "",
"animate-clear": "no",
"animate-end": "",
"audio-speaker": "left",
"background-image": "",
"clear-screen": "no",
"duration": "0",
"location": "+/media/01.mp3",
"mplayer-audio": "local",
"mplayer-other-options": "",
"mplayer-volume": "",
"title": "mono left",
"track-ref": "",
"track-text": "Through the LEFT headphone",
"track-text-colour": "green",
"track-text-font": "arial 30 bold",
"track-text-x": "200",
"track-text-y": "200",
"type": "audio"
},
{
"animate-begin": "",
"animate-clear": "no",
"animate-end": "",
"audio-speaker": "right",
"background-image": "+/media/sarename.gif",
"clear-screen": "no",
"duration": "0",
"location": "+/media/01.mp3",
"mplayer-audio": "local",
"mplayer-other-options": "",
"mplayer-volume": "",
"title": "right local",
"track-ref": "",
"track-text": "Through the RIGHT headphone socket",
"track-text-colour": "pink",
"track-text-font": "arial 20 bold",
"track-text-x": "600",
"track-text-y": "700",
"type": "audio"
}
]
}
@@ -0,0 +1,49 @@
{
"issue": "1.2",
"shows": [
{
"controlled-show": "",
"show-ref": "start",
"start-show": "mediashow",
"title": "Start",
"type": "start"
},
{
"audio-speaker": "stereo",
"disable-controls": "no",
"duration": "5",
"has-child": "no",
"hint-colour": "white",
"hint-font": "Helvetica 30 bold",
"hint-text": "",
"hint-y": "100",
"medialist": "media.json",
"mplayer-audio": "hdmi",
"mplayer-other-options": "",
"mplayer-volume": "0",
"next-input": "",
"omx-audio": "hdmi",
"omx-other-options": "",
"omx-volume": "0",
"omx-window": "",
"progress": "auto",
"repeat": "interval",
"repeat-interval": "10",
"sequence": "ordered",
"show-ref": "mediashow",
"show-text": "show text - same for every track",
"show-text-colour": "red",
"show-text-font": "arial 20 bold",
"show-text-x": "1500",
"show-text-y": "700",
"title": "Mediashow",
"transition": "cut",
"trigger": "start",
"trigger-end": "none",
"trigger-end-time": "",
"trigger-input": "",
"trigger-next": "none",
"type": "mediashow"
}
]
}
@@ -0,0 +1,27 @@
{
"issue": "1.2",
"tracks": [
{
"animate-begin": "",
"animate-clear": "no",
"animate-end": "",
"audio-speaker": "",
"audiospeaker": "",
"background-image": "",
"clear-screen": "no",
"duration": "0",
"location": "+/media/01.mp3",
"mplayer-audio": "",
"mplayer-other-options": "",
"mplayer-volume": "",
"title": "01.mp3",
"track-ref": "",
"track-text": "",
"track-text-colour": "",
"track-text-font": "",
"track-text-x": "0",
"track-text-y": "0",
"type": "audio"
}
]
}
@@ -0,0 +1,48 @@
{
"issue": "1.2",
"tracks": [
{
"background-colour": "blue",
"background-image": "",
"duration": "10",
"message-colour": "white",
"message-font": "Helvetica 25 bold",
"text": "Two repeating mediashows playing simultaneously\n\nThe audio show has its controls disabled",
"title": "Intro",
"track-ref": "",
"type": "message"
},
{
"animate-begin": "",
"animate-clear": "no",
"animate-end": "",
"duration": "",
"location": "+/media/sarename.gif",
"title": "sarename.gif",
"track-ref": "",
"track-text": "",
"track-text-colour": "",
"track-text-font": "",
"track-text-x": "0",
"track-text-y": "0",
"transition": "cut",
"type": "image"
},
{
"animate-begin": "",
"animate-clear": "no",
"animate-end": "",
"duration": "",
"location": "+/media/sunset.gif",
"title": "sunset.gif",
"track-ref": "",
"track-text": "",
"track-text-colour": "",
"track-text-font": "",
"track-text-x": "0",
"track-text-y": "0",
"transition": "cut",
"type": "image"
}
]
}
Oops, something went wrong.

0 comments on commit c84500c

Please sign in to comment.