diff --git a/manual/source/creating_service.rst b/manual/source/creating_service.rst index e2eeb8c..1c37ec3 100644 --- a/manual/source/creating_service.rst +++ b/manual/source/creating_service.rst @@ -239,6 +239,15 @@ you your three options. You can change or add to the keyboard shortcuts here :menuselection:`Settings --> Configure Shortcuts`. +.. _linked-audio: + +Linked Audio Control +-------------------- + +|audio_pause| You can stop or start the audio playing on your :ref:`songs_linked` +by using this button. This button becomes available when you have linked an +audio file to a song and it is in use. + .. _new_service: New, Open and Saving the Service @@ -285,3 +294,4 @@ your service file. Choose the location you want to save your file and click .. |SERVICE_NEW| image:: pics/service_new.png .. |SERVICE_OPEN| image:: pics/service_open.png .. |SERVICE_SAVE| image:: pics/service_save.png +.. |AUDIO_PAUSE| image:: pics/media_playback_pause.png \ No newline at end of file diff --git a/manual/source/pics/song_edit_authors.png b/manual/source/pics/song_edit_authors.png index 4a4a3a7..cd4c9a6 100644 Binary files a/manual/source/pics/song_edit_authors.png and b/manual/source/pics/song_edit_authors.png differ diff --git a/manual/source/pics/song_edit_lyrics.png b/manual/source/pics/song_edit_lyrics.png index 1072737..3a104df 100644 Binary files a/manual/source/pics/song_edit_lyrics.png and b/manual/source/pics/song_edit_lyrics.png differ diff --git a/manual/source/pics/song_edit_theme_copyright.png b/manual/source/pics/song_edit_theme_copyright.png index 5234ccc..5b37d23 100644 Binary files a/manual/source/pics/song_edit_theme_copyright.png and b/manual/source/pics/song_edit_theme_copyright.png differ diff --git a/manual/source/songs.rst b/manual/source/songs.rst index f6197b6..99cc7bd 100644 --- a/manual/source/songs.rst +++ b/manual/source/songs.rst @@ -106,7 +106,7 @@ from CCLI SongSelect. Creating or Editing a Song Slide ================================ -If you want to create a new song slide or, once you have a song imported, you +When you want to create a new song slide or, once you have a song imported, you want to edit and rearrange the Title & Lyrics, Author, Topics & Song Book, assign a Theme, or edit Copyright Info & Comments, you will do this through the `Song Editor`. @@ -231,9 +231,9 @@ Authors names are displayed in the footer. Theme, Copyright Info & Comments ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -On this tab you can assign a *Theme* to a song, enter the *Copyright information* -and add the *CCLI number*. If you imported a song from SongSelect this -information will usually be entered. +You can assign a :ref:`themes` to a song, enter the *Copyright information* +and add the *CCLI number* to the song. If you imported a song from SongSelect +this information will usually be entered. .. image:: pics/song_edit_theme_copyright.png @@ -252,3 +252,45 @@ number is not displayed in the footer. **Comments:** You can add comments in this box. This information is not displayed in the footer. + +.. _songs_linked: + +Linked Audio +^^^^^^^^^^^^ + +OpenLP gives you the ability to play an audio file or multiple audio files when +the song is displayed live. + +.. image:: pics/song_edit_linked.png + +**Add File(s):** Add an audio file from a folder on your computer by clicking + :guilabel:`Add File(s)`. + +**Add Media:** Add an audio file that is already in the :ref:`media-manager` by + clicking :guilabel:`Add Media`. + +**Remove:** Click on a file you want to remove and click :guilabel:`Remove`. + +**Remove All:** Click on :guilabel:`Remove All` to remove all audio files linked + to the song. + +If you added multiple audio files, they will play in the order listed. You can +change their position in the order by clicking on an audio file and using the +arrows. + +|move_up| Move selection up one position. + +|move_down| Move selection down one position. + +When you are done, click :guilabel:`Save` to save your choices. You can click +:guilabel:`Cancel` at anytime if you change your mind. + +|audio_pause| This button will appear in the :ref:`linked-audio` when an +audio file is being played with a song. You can stop or start the audio playing +by using this button. + +.. These are all the image templates that are used in this page. + +.. |MOVE_UP| image:: pics/service_up.png +.. |MOVE_DOWN| image:: pics/service_down.png +.. |AUDIO_PAUSE| image:: pics/media_playback_pause.png