Add comment action

diff --git a/documentation_en.md b/documentation_en.md
index ee95ad38da5af6ab2092bb6920495527295b95d7..c616eda8ad724db3c4120d08f6639b87e409cbec 100644 (file)
--- a/documentation_en.md
+++ b/documentation_en.md
@@ -348,6 +348,8 @@ Pauses "music1.mp3" for 10 seconds and reruns it afterward, seeking to 5 seconds
 later.
 
 #### List of all the actions:
+- `comment`: does nothing, but shows a comment in the action windows
+    * `message: "some text"` the message to show
 - `play` : start a music. Music Sampler only runs a music once (if you want to
   have it playing several time concurrently, duplicate it or make symbolic
   link). Parameters:

diff --git a/documentation_fr.md b/documentation_fr.md
index 76a4b9753bdb32605e0e5186c7d4ab98478f253c..7434a5c2b8dfd63e811beaf00722c3c8b0458ace 100644 (file)
--- a/documentation_fr.md
+++ b/documentation_fr.md
@@ -371,6 +371,8 @@ Met en pause la musique "music1.mp3" pour 10 secondes et la relance après, en
 avançant de 5 secondes dans la musique.
 
 #### Liste des actions possibles: 
+- `comment`: ne fait aucune action, mais affiche un message dans la zone des actions
+    * `message: "some text"` le message à afficher
 - `play` : joue une musique. music_sampler ne joue qu'une musique à la fois : si
   la musique demandée est déjà en train d'être jouée, elle n'est pas relancée ou
   jouée "par dessus". Paramètres :

diff --git a/music_sampler/actions/__init__.py b/music_sampler/actions/__init__.py
index e0671fe3498b97d1bb70905106501867ca82f4ad..2f4cc54394545f4df664406d83fad9e6852bf94d 100644 (file)
--- a/music_sampler/actions/__init__.py
+++ b/music_sampler/actions/__init__.py
@@ -1,3 +1,4 @@
+from . import comment
 from . import interrupt_wait
 from . import load_music
 from . import pause

diff --git a/music_sampler/actions/comment.py b/music_sampler/actions/comment.py
new file mode 100644 (file)
index 0000000..c7baa82
--- /dev/null
+++ b/music_sampler/actions/comment.py
@@ -0,0 +1,5 @@
+def run(action, music=None, **kwargs):
+    pass
+
+def description(action, message, **kwargs):
+    return message

diff --git a/music_sampler/helpers.py b/music_sampler/helpers.py
index fbd338b6ecfb730a630254f89c3c2f060f1c782d..9eb1a950ca50fb8028e7b52dd1d601f0d2a908f7 100644 (file)
--- a/music_sampler/helpers.py
+++ b/music_sampler/helpers.py
@@ -232,7 +232,7 @@ def dump_config():
                 item, max_size, getattr(Config, item)))
 
 def build_config(args):
-    stream = open(Config.yml_file, "r")
+    stream = open(Config.yml_file, "r", encoding='utf8')
     try:
         config = yaml.safe_load(stream)
     except Exception as e:

diff --git a/music_sampler/mapping.py b/music_sampler/mapping.py
index 193f5e5d034a7a797076d3a68ca21c80627092cf..fc9768b7c665b1bbd709e500ebcf5f04ce6b5b97 100644 (file)
--- a/music_sampler/mapping.py
+++ b/music_sampler/mapping.py
@@ -391,7 +391,7 @@ class Mapping(RelativeLayout):
                             "a float, ignored".format(filename))
             return music_property
 
-        stream = open(Config.yml_file, "r")
+        stream = open(Config.yml_file, "r", encoding='utf8')
         try:
             config = yaml.safe_load(stream)
         except Exception as e:

diff --git a/music_sampler/sysfont.py b/music_sampler/sysfont.py
index f47693ea15865663d9ba6a6b2719f1f82363d8d6..7bb518ebd016c15cd9baa20a169ebc859a282bbd 100644 (file)
--- a/music_sampler/sysfont.py
+++ b/music_sampler/sysfont.py
@@ -115,7 +115,7 @@ def _cache_fonts_fontconfig():
 
         # get the font name
         name = None
-        if len(values) > 3:
+        if len(values) > 4:
             fullnames, fullnamelangs = values[3:]
             langs = fullnamelangs.split(",")
             try: