diff --git a/docs/.buildinfo b/docs/.buildinfo
index 6c775b1f..a8933ef3 100644
--- a/docs/.buildinfo
+++ b/docs/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: bb033bd19bd7ef751472238199225b1f
+config: d3fb11fa7b8483d4c0ac5f94c441d84d
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/README.html b/docs/README.html
index 568b93d5..ed7ea641 100644
--- a/docs/README.html
+++ b/docs/README.html
@@ -58,7 +58,7 @@
 	<br />
 	<a href="index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -328,7 +328,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/gi/overrides/Gdk.html b/docs/_modules/gi/overrides/Gdk.html
index af47ab16..6e8c3f43 100644
--- a/docs/_modules/gi/overrides/Gdk.html
+++ b/docs/_modules/gi/overrides/Gdk.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -183,54 +183,65 @@ <h1>Source code for gi.overrides.Gdk</h1><div class="highlight"><pre>
 
 <span class="kn">from</span> <span class="nn">..overrides</span> <span class="k">import</span> <span class="n">override</span><span class="p">,</span> <span class="n">strip_boolean_result</span>
 <span class="kn">from</span> <span class="nn">..module</span> <span class="k">import</span> <span class="n">get_introspection_module</span>
-<span class="kn">from</span> <span class="nn">gi</span> <span class="k">import</span> <span class="n">PyGIDeprecationWarning</span>
+<span class="kn">from</span> <span class="nn">gi</span> <span class="k">import</span> <span class="n">PyGIDeprecationWarning</span><span class="p">,</span> <span class="n">require_version</span>
 
 <span class="n">Gdk</span> <span class="o">=</span> <span class="n">get_introspection_module</span><span class="p">(</span><span class="s1">&#39;Gdk&#39;</span><span class="p">)</span>
 
 <span class="n">__all__</span> <span class="o">=</span> <span class="p">[]</span>
 
 
-<span class="k">class</span> <span class="nc">Color</span><span class="p">(</span><span class="n">Gdk</span><span class="o">.</span><span class="n">Color</span><span class="p">):</span>
-    <span class="n">MAX_VALUE</span> <span class="o">=</span> <span class="mi">65535</span>
+<span class="c1"># https://bugzilla.gnome.org/show_bug.cgi?id=673396</span>
+<span class="k">try</span><span class="p">:</span>
+    <span class="n">require_version</span><span class="p">(</span><span class="s2">&quot;GdkX11&quot;</span><span class="p">,</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">_version</span><span class="p">)</span>
+    <span class="kn">from</span> <span class="nn">gi.repository</span> <span class="k">import</span> <span class="n">GdkX11</span>
+    <span class="n">GdkX11</span>  <span class="c1"># pyflakes</span>
+<span class="k">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">ImportError</span><span class="p">):</span>
+    <span class="k">pass</span>
 
-    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">red</span><span class="p">,</span> <span class="n">green</span><span class="p">,</span> <span class="n">blue</span><span class="p">):</span>
-        <span class="n">Gdk</span><span class="o">.</span><span class="n">Color</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">red</span> <span class="o">=</span> <span class="n">red</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">green</span> <span class="o">=</span> <span class="n">green</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">blue</span> <span class="o">=</span> <span class="n">blue</span>
+<span class="k">if</span> <span class="nb">hasattr</span><span class="p">(</span><span class="n">Gdk</span><span class="p">,</span> <span class="s1">&#39;Color&#39;</span><span class="p">):</span>
+    <span class="c1"># Gdk.Color was deprecated since 3.14 and dropped in Gtk+-4.0</span>
+    <span class="k">class</span> <span class="nc">Color</span><span class="p">(</span><span class="n">Gdk</span><span class="o">.</span><span class="n">Color</span><span class="p">):</span>
+        <span class="n">MAX_VALUE</span> <span class="o">=</span> <span class="mi">65535</span>
 
-    <span class="k">def</span> <span class="nf">__eq__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">other</span><span class="p">):</span>
-        <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">equal</span><span class="p">(</span><span class="n">other</span><span class="p">)</span>
+        <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">red</span><span class="p">,</span> <span class="n">green</span><span class="p">,</span> <span class="n">blue</span><span class="p">):</span>
+            <span class="n">Gdk</span><span class="o">.</span><span class="n">Color</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">red</span> <span class="o">=</span> <span class="n">red</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">green</span> <span class="o">=</span> <span class="n">green</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">blue</span> <span class="o">=</span> <span class="n">blue</span>
 
-    <span class="k">def</span> <span class="nf">__repr__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="k">return</span> <span class="s1">&#39;Gdk.Color(red=</span><span class="si">%d</span><span class="s1">, green=</span><span class="si">%d</span><span class="s1">, blue=</span><span class="si">%d</span><span class="s1">)&#39;</span> <span class="o">%</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">red</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">green</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">blue</span><span class="p">)</span>
+        <span class="k">def</span> <span class="nf">__eq__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">other</span><span class="p">):</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">equal</span><span class="p">(</span><span class="n">other</span><span class="p">)</span>
+
+        <span class="k">def</span> <span class="nf">__repr__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+            <span class="k">return</span> <span class="s1">&#39;Gdk.Color(red=</span><span class="si">%d</span><span class="s1">, green=</span><span class="si">%d</span><span class="s1">, blue=</span><span class="si">%d</span><span class="s1">)&#39;</span> <span class="o">%</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">red</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">green</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">blue</span><span class="p">)</span>
 
-    <span class="n">red_float</span> <span class="o">=</span> <span class="nb">property</span><span class="p">(</span><span class="n">fget</span><span class="o">=</span><span class="k">lambda</span> <span class="bp">self</span><span class="p">:</span> <span class="bp">self</span><span class="o">.</span><span class="n">red</span> <span class="o">/</span> <span class="nb">float</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">),</span>
-                         <span class="n">fset</span><span class="o">=</span><span class="k">lambda</span> <span class="bp">self</span><span class="p">,</span> <span class="n">v</span><span class="p">:</span> <span class="nb">setattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="s1">&#39;red&#39;</span><span class="p">,</span> <span class="nb">int</span><span class="p">(</span><span class="n">v</span> <span class="o">*</span> <span class="bp">self</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">)))</span>
+        <span class="n">red_float</span> <span class="o">=</span> <span class="nb">property</span><span class="p">(</span><span class="n">fget</span><span class="o">=</span><span class="k">lambda</span> <span class="bp">self</span><span class="p">:</span> <span class="bp">self</span><span class="o">.</span><span class="n">red</span> <span class="o">/</span> <span class="nb">float</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">),</span>
+                             <span class="n">fset</span><span class="o">=</span><span class="k">lambda</span> <span class="bp">self</span><span class="p">,</span> <span class="n">v</span><span class="p">:</span> <span class="nb">setattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="s1">&#39;red&#39;</span><span class="p">,</span> <span class="nb">int</span><span class="p">(</span><span class="n">v</span> <span class="o">*</span> <span class="bp">self</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">)))</span>
 
-    <span class="n">green_float</span> <span class="o">=</span> <span class="nb">property</span><span class="p">(</span><span class="n">fget</span><span class="o">=</span><span class="k">lambda</span> <span class="bp">self</span><span class="p">:</span> <span class="bp">self</span><span class="o">.</span><span class="n">green</span> <span class="o">/</span> <span class="nb">float</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">),</span>
-                           <span class="n">fset</span><span class="o">=</span><span class="k">lambda</span> <span class="bp">self</span><span class="p">,</span> <span class="n">v</span><span class="p">:</span> <span class="nb">setattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="s1">&#39;green&#39;</span><span class="p">,</span> <span class="nb">int</span><span class="p">(</span><span class="n">v</span> <span class="o">*</span> <span class="bp">self</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">)))</span>
+        <span class="n">green_float</span> <span class="o">=</span> <span class="nb">property</span><span class="p">(</span><span class="n">fget</span><span class="o">=</span><span class="k">lambda</span> <span class="bp">self</span><span class="p">:</span> <span class="bp">self</span><span class="o">.</span><span class="n">green</span> <span class="o">/</span> <span class="nb">float</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">),</span>
+                               <span class="n">fset</span><span class="o">=</span><span class="k">lambda</span> <span class="bp">self</span><span class="p">,</span> <span class="n">v</span><span class="p">:</span> <span class="nb">setattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="s1">&#39;green&#39;</span><span class="p">,</span> <span class="nb">int</span><span class="p">(</span><span class="n">v</span> <span class="o">*</span> <span class="bp">self</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">)))</span>
 
-    <span class="n">blue_float</span> <span class="o">=</span> <span class="nb">property</span><span class="p">(</span><span class="n">fget</span><span class="o">=</span><span class="k">lambda</span> <span class="bp">self</span><span class="p">:</span> <span class="bp">self</span><span class="o">.</span><span class="n">blue</span> <span class="o">/</span> <span class="nb">float</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">),</span>
-                          <span class="n">fset</span><span class="o">=</span><span class="k">lambda</span> <span class="bp">self</span><span class="p">,</span> <span class="n">v</span><span class="p">:</span> <span class="nb">setattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="s1">&#39;blue&#39;</span><span class="p">,</span> <span class="nb">int</span><span class="p">(</span><span class="n">v</span> <span class="o">*</span> <span class="bp">self</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">)))</span>
+        <span class="n">blue_float</span> <span class="o">=</span> <span class="nb">property</span><span class="p">(</span><span class="n">fget</span><span class="o">=</span><span class="k">lambda</span> <span class="bp">self</span><span class="p">:</span> <span class="bp">self</span><span class="o">.</span><span class="n">blue</span> <span class="o">/</span> <span class="nb">float</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">),</span>
+                              <span class="n">fset</span><span class="o">=</span><span class="k">lambda</span> <span class="bp">self</span><span class="p">,</span> <span class="n">v</span><span class="p">:</span> <span class="nb">setattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="s1">&#39;blue&#39;</span><span class="p">,</span> <span class="nb">int</span><span class="p">(</span><span class="n">v</span> <span class="o">*</span> <span class="bp">self</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">)))</span>
 
-    <span class="k">def</span> <span class="nf">to_floats</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="sd">&quot;&quot;&quot;Return (red_float, green_float, blue_float) triple.&quot;&quot;&quot;</span>
+        <span class="k">def</span> <span class="nf">to_floats</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+            <span class="sd">&quot;&quot;&quot;Return (red_float, green_float, blue_float) triple.&quot;&quot;&quot;</span>
 
-        <span class="k">return</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">red_float</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">green_float</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">blue_float</span><span class="p">)</span>
+            <span class="k">return</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">red_float</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">green_float</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">blue_float</span><span class="p">)</span>
 
-    <span class="nd">@staticmethod</span>
-    <span class="k">def</span> <span class="nf">from_floats</span><span class="p">(</span><span class="n">red</span><span class="p">,</span> <span class="n">green</span><span class="p">,</span> <span class="n">blue</span><span class="p">):</span>
-        <span class="sd">&quot;&quot;&quot;Return a new Color object from red/green/blue values from 0.0 to 1.0.&quot;&quot;&quot;</span>
+        <span class="nd">@staticmethod</span>
+        <span class="k">def</span> <span class="nf">from_floats</span><span class="p">(</span><span class="n">red</span><span class="p">,</span> <span class="n">green</span><span class="p">,</span> <span class="n">blue</span><span class="p">):</span>
+            <span class="sd">&quot;&quot;&quot;Return a new Color object from red/green/blue values from 0.0 to 1.0.&quot;&quot;&quot;</span>
 
-        <span class="k">return</span> <span class="n">Color</span><span class="p">(</span><span class="nb">int</span><span class="p">(</span><span class="n">red</span> <span class="o">*</span> <span class="n">Color</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">),</span>
-                     <span class="nb">int</span><span class="p">(</span><span class="n">green</span> <span class="o">*</span> <span class="n">Color</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">),</span>
-                     <span class="nb">int</span><span class="p">(</span><span class="n">blue</span> <span class="o">*</span> <span class="n">Color</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">))</span>
+            <span class="k">return</span> <span class="n">Color</span><span class="p">(</span><span class="nb">int</span><span class="p">(</span><span class="n">red</span> <span class="o">*</span> <span class="n">Color</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">),</span>
+                         <span class="nb">int</span><span class="p">(</span><span class="n">green</span> <span class="o">*</span> <span class="n">Color</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">),</span>
+                         <span class="nb">int</span><span class="p">(</span><span class="n">blue</span> <span class="o">*</span> <span class="n">Color</span><span class="o">.</span><span class="n">MAX_VALUE</span><span class="p">))</span>
 
-<span class="n">Color</span> <span class="o">=</span> <span class="n">override</span><span class="p">(</span><span class="n">Color</span><span class="p">)</span>
-<span class="n">__all__</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="s1">&#39;Color&#39;</span><span class="p">)</span>
+    <span class="n">Color</span> <span class="o">=</span> <span class="n">override</span><span class="p">(</span><span class="n">Color</span><span class="p">)</span>
+    <span class="n">__all__</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="s1">&#39;Color&#39;</span><span class="p">)</span>
 
-<span class="k">if</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">_version</span> <span class="o">==</span> <span class="s1">&#39;3.0&#39;</span><span class="p">:</span>
+<span class="k">if</span> <span class="nb">hasattr</span><span class="p">(</span><span class="n">Gdk</span><span class="p">,</span> <span class="s1">&#39;RGBA&#39;</span><span class="p">):</span>
+    <span class="c1"># Introduced since Gtk+-3.0</span>
     <span class="k">class</span> <span class="nc">RGBA</span><span class="p">(</span><span class="n">Gdk</span><span class="o">.</span><span class="n">RGBA</span><span class="p">):</span>
         <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">red</span><span class="o">=</span><span class="mf">1.0</span><span class="p">,</span> <span class="n">green</span><span class="o">=</span><span class="mf">1.0</span><span class="p">,</span> <span class="n">blue</span><span class="o">=</span><span class="mf">1.0</span><span class="p">,</span> <span class="n">alpha</span><span class="o">=</span><span class="mf">1.0</span><span class="p">):</span>
             <span class="n">Gdk</span><span class="o">.</span><span class="n">RGBA</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
@@ -393,6 +404,7 @@ <h1>Source code for gi.overrides.Gdk</h1><div class="highlight"><pre>
         <span class="n">base_repr</span> <span class="o">=</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">Event</span><span class="o">.</span><span class="fm">__repr__</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="n">strip</span><span class="p">(</span><span class="s2">&quot;&gt;&lt;&quot;</span><span class="p">)</span>
         <span class="k">return</span> <span class="s2">&quot;&lt;</span><span class="si">%s</span><span class="s2"> type=</span><span class="si">%r</span><span class="s2">&gt;&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">base_repr</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">type</span><span class="p">)</span>
 
+
 <span class="n">Event</span> <span class="o">=</span> <span class="n">override</span><span class="p">(</span><span class="n">Event</span><span class="p">)</span>
 <span class="n">__all__</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="s1">&#39;Event&#39;</span><span class="p">)</span>
 
@@ -462,17 +474,21 @@ <h1>Source code for gi.overrides.Gdk</h1><div class="highlight"><pre>
         <span class="n">Gtk</span> <span class="o">=</span> <span class="n">get_introspection_module</span><span class="p">(</span><span class="s1">&#39;Gtk&#39;</span><span class="p">)</span>
         <span class="n">Gtk</span><span class="o">.</span><span class="n">drag_finish</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">success</span><span class="p">,</span> <span class="n">del_</span><span class="p">,</span> <span class="n">time</span><span class="p">)</span>
 
+
 <span class="n">DragContext</span> <span class="o">=</span> <span class="n">override</span><span class="p">(</span><span class="n">DragContext</span><span class="p">)</span>
 <span class="n">__all__</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="s1">&#39;DragContext&#39;</span><span class="p">)</span>
 
 
 <span class="k">class</span> <span class="nc">Cursor</span><span class="p">(</span><span class="n">Gdk</span><span class="o">.</span><span class="n">Cursor</span><span class="p">):</span>
+
     <span class="k">def</span> <span class="nf">__new__</span><span class="p">(</span><span class="bp">cls</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kwds</span><span class="p">):</span>
         <span class="n">arg_len</span> <span class="o">=</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span>
         <span class="n">kwd_len</span> <span class="o">=</span> <span class="nb">len</span><span class="p">(</span><span class="n">kwds</span><span class="p">)</span>
         <span class="n">total_len</span> <span class="o">=</span> <span class="n">arg_len</span> <span class="o">+</span> <span class="n">kwd_len</span>
 
         <span class="k">if</span> <span class="n">total_len</span> <span class="o">==</span> <span class="mi">1</span><span class="p">:</span>
+            <span class="k">if</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">_version</span> <span class="o">==</span> <span class="s2">&quot;4.0&quot;</span><span class="p">:</span>
+                <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s2">&quot;Wrong number of parameters&quot;</span><span class="p">)</span>
             <span class="c1"># Since g_object_newv (super.__new__) does not seem valid for</span>
             <span class="c1"># direct use with GdkCursor, we must assume usage of at least</span>
             <span class="c1"># one of the C constructors to be valid.</span>
@@ -510,8 +526,10 @@ <h1>Source code for gi.overrides.Gdk</h1><div class="highlight"><pre>
 <span class="n">Cursor</span> <span class="o">=</span> <span class="n">override</span><span class="p">(</span><span class="n">Cursor</span><span class="p">)</span>
 <span class="n">__all__</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="s1">&#39;Cursor&#39;</span><span class="p">)</span>
 
-<span class="n">color_parse</span> <span class="o">=</span> <span class="n">strip_boolean_result</span><span class="p">(</span><span class="n">Gdk</span><span class="o">.</span><span class="n">color_parse</span><span class="p">)</span>
-<span class="n">__all__</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="s1">&#39;color_parse&#39;</span><span class="p">)</span>
+<span class="k">if</span> <span class="nb">hasattr</span><span class="p">(</span><span class="n">Gdk</span><span class="p">,</span> <span class="s1">&#39;color_parse&#39;</span><span class="p">):</span>
+    <span class="c1"># Gdk.Color was deprecated since 3.14 and dropped in Gtk+-4.0</span>
+    <span class="n">color_parse</span> <span class="o">=</span> <span class="n">strip_boolean_result</span><span class="p">(</span><span class="n">Gdk</span><span class="o">.</span><span class="n">color_parse</span><span class="p">)</span>
+    <span class="n">__all__</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="s1">&#39;color_parse&#39;</span><span class="p">)</span>
 
 
 <span class="c1"># Note, we cannot override the entire class as Gdk.Atom has no gtype, so just</span>
@@ -586,9 +604,9 @@ <h1>Source code for gi.overrides.Gdk</h1><div class="highlight"><pre>
     <span class="n">SELECTION_TYPE_STRING</span> <span class="o">=</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">atom_intern</span><span class="p">(</span><span class="s1">&#39;STRING&#39;</span><span class="p">,</span> <span class="kc">True</span><span class="p">)</span>
     <span class="n">__all__</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="s1">&#39;SELECTION_TYPE_STRING&#39;</span><span class="p">)</span>
 
-<span class="kn">import</span> <span class="nn">sys</span>
-
-<span class="n">initialized</span><span class="p">,</span> <span class="n">argv</span> <span class="o">=</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">init_check</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">)</span>
+<span class="k">if</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">_version</span> <span class="ow">in</span> <span class="p">(</span><span class="s1">&#39;2.0&#39;</span><span class="p">,</span> <span class="s1">&#39;3.0&#39;</span><span class="p">):</span>
+    <span class="kn">import</span> <span class="nn">sys</span>
+    <span class="n">initialized</span><span class="p">,</span> <span class="n">argv</span> <span class="o">=</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">init_check</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">)</span>
 </pre></div>
 
            </div>
@@ -625,7 +643,7 @@ <h1>Source code for gi.overrides.Gdk</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/index.html b/docs/_modules/index.html
index 9253c2ce..c7b00616 100644
--- a/docs/_modules/index.html
+++ b/docs/_modules/index.html
@@ -56,7 +56,7 @@
 	<br />
 	<a href="../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -208,7 +208,7 @@ <h1>All modules for which code is available</h1>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/builder.html b/docs/_modules/pympress/builder.html
index e964eac6..4f32de6d 100644
--- a/docs/_modules/pympress/builder.html
+++ b/docs/_modules/pympress/builder.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -516,7 +516,7 @@ <h1>Source code for pympress.builder</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/callbacks.html b/docs/_modules/pympress/callbacks.html
index 04374058..24fcb7e5 100644
--- a/docs/_modules/pympress/callbacks.html
+++ b/docs/_modules/pympress/callbacks.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -189,55 +189,63 @@ <h1>Source code for pympress.callbacks</h1><div class="highlight"><pre>
 
 <div class="viewcode-block" id="UICallbacks"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.UICallbacks">[docs]</a><span class="k">class</span> <span class="nc">UICallbacks</span><span class="p">(</span><span class="nb">object</span><span class="p">):</span>
 
-<div class="viewcode-block" id="UICallbacks.get_current_page"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.UICallbacks.get_current_page">[docs]</a>    <span class="nd">@classmethod</span>
-    <span class="k">def</span> <span class="nf">get_current_page</span><span class="p">(</span><span class="bp">cls</span><span class="p">):</span>
+<div class="viewcode-block" id="UICallbacks.get_current_page"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.UICallbacks.get_current_page">[docs]</a>    <span class="k">def</span> <span class="nf">get_current_page</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Statically get page and page type</span>
 
-<span class="sd">		Returns:</span>
-<span class="sd">			(:class:`~pympress.document.Page`, `int`): The current page, and one</span>
-<span class="sd">			of `~pympress.ui.PDF_REGULAR`, `~pympress.ui.PDF_CONTENT_PAGE`, or `~pympress.ui.PDF_NOTES_PAGE`</span>
+<span class="sd">        Returns:</span>
+<span class="sd">            (:class:`~pympress.document.Page`, `int`): The current page, and one</span>
+<span class="sd">            of `~pympress.ui.PDF_REGULAR`, `~pympress.ui.PDF_CONTENT_PAGE`, or `~pympress.ui.PDF_NOTES_PAGE`</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">pass</span></div>
+        <span class="k">raise</span> <span class="ne">NotImplementedError</span></div>
 
 
-<div class="viewcode-block" id="UICallbacks.notify_page_change"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.UICallbacks.notify_page_change">[docs]</a>    <span class="nd">@classmethod</span>
-    <span class="k">def</span> <span class="nf">notify_page_change</span><span class="p">(</span><span class="bp">cls</span><span class="p">,</span> <span class="n">unpause</span> <span class="o">=</span> <span class="kc">True</span><span class="p">):</span>
+<div class="viewcode-block" id="UICallbacks.goto_page"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.UICallbacks.goto_page">[docs]</a>    <span class="k">def</span> <span class="nf">goto_page</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">page_number</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot; Go to the given page number.</span>
+
+<span class="sd">        Args:</span>
+<span class="sd">            page_number (`int`): the desired page number.</span>
+<span class="sd">        &quot;&quot;&quot;</span>
+        <span class="k">raise</span> <span class="ne">NotImplementedError</span></div>
+
+
+<div class="viewcode-block" id="UICallbacks.on_page_change"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.UICallbacks.on_page_change">[docs]</a>    <span class="k">def</span> <span class="nf">on_page_change</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">unpause</span> <span class="o">=</span> <span class="kc">True</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Statically notify the UI of a page change (typically from document)</span>
 
 <span class="sd">        Args:</span>
 <span class="sd">            unpause (`bool`): whether to unpause the click while updating the page</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">pass</span></div>
+        <span class="k">raise</span> <span class="ne">NotImplementedError</span></div>
 
 
-<div class="viewcode-block" id="UICallbacks.redraw_current_slide"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.UICallbacks.redraw_current_slide">[docs]</a>    <span class="nd">@classmethod</span>
-    <span class="k">def</span> <span class="nf">redraw_current_slide</span><span class="p">(</span><span class="bp">cls</span><span class="p">):</span>
+<div class="viewcode-block" id="UICallbacks.redraw_current_slide"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.UICallbacks.redraw_current_slide">[docs]</a>    <span class="k">def</span> <span class="nf">redraw_current_slide</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Static way to queue a redraw of the current slides (in both winows)</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">pass</span></div>
+        <span class="k">raise</span> <span class="ne">NotImplementedError</span></div></div>
 
 
-<div class="viewcode-block" id="UICallbacks.notify_label_event"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.UICallbacks.notify_label_event">[docs]</a>    <span class="nd">@classmethod</span>
-    <span class="k">def</span> <span class="nf">notify_label_event</span><span class="p">(</span><span class="bp">cls</span><span class="p">):</span>
-        <span class="sd">&quot;&quot;&quot; Static way to start the &quot;go to&quot; label editing.</span>
+<div class="viewcode-block" id="EditableButton"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.EditableButton">[docs]</a><span class="k">class</span> <span class="nc">EditableButton</span><span class="p">(</span><span class="nb">object</span><span class="p">):</span>
 
-<span class="sd">        Typically used as callbacks from document links.</span>
+<div class="viewcode-block" id="EditableButton.start_editing"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.EditableButton.start_editing">[docs]</a>    <span class="k">def</span> <span class="nf">start_editing</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot; Static way to start the label editing.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">pass</span></div>
+        <span class="k">raise</span> <span class="ne">NotImplementedError</span></div>
 
 
-<div class="viewcode-block" id="UICallbacks.stop_editing_slide"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.UICallbacks.stop_editing_slide">[docs]</a>    <span class="nd">@classmethod</span>
-    <span class="k">def</span> <span class="nf">stop_editing_slide</span><span class="p">(</span><span class="bp">cls</span><span class="p">):</span>
+<div class="viewcode-block" id="EditableButton.stop_editing"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.EditableButton.stop_editing">[docs]</a>    <span class="k">def</span> <span class="nf">stop_editing</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Make sure that the current page number is not being edited.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">pass</span></div>
+        <span class="k">raise</span> <span class="ne">NotImplementedError</span></div></div>
+
+<span class="c1"># Instance of a class inheriting from :class:`~callbacks.UICallbacks`, that will handle the above-defined callbacks</span>
+<span class="n">ui</span> <span class="o">=</span> <span class="kc">None</span>
+
+<span class="c1"># Instance of a class inheriting from :class:`~callbacks.EditableButtonCallbacks`</span>
+<span class="n">page_number</span> <span class="o">=</span> <span class="kc">None</span>
+
+<span class="c1"># Instance of a class inheriting from :class:`~callbacks.EditableButtonCallbacks`</span>
+<span class="n">talk_time</span> <span class="o">=</span> <span class="kc">None</span>
 
 
-<div class="viewcode-block" id="UICallbacks.stop_editing_time"><a class="viewcode-back" href="../../pympress.html#pympress.callbacks.UICallbacks.stop_editing_time">[docs]</a>    <span class="nd">@classmethod</span>
-    <span class="k">def</span> <span class="nf">stop_editing_time</span><span class="p">(</span><span class="bp">cls</span><span class="p">):</span>
-        <span class="sd">&quot;&quot;&quot; Make sure that the estiamte talk time is not being edited.</span>
-<span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">pass</span></div></div>
 </pre></div>
 
            </div>
@@ -274,7 +282,7 @@ <h1>Source code for pympress.callbacks</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/config.html b/docs/_modules/pympress/config.html
index 105a8ef2..ae0cc84e 100644
--- a/docs/_modules/pympress/config.html
+++ b/docs/_modules/pympress/config.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -202,7 +202,7 @@ <h1>Source code for pympress.config</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">pympress.util</span> <span class="k">import</span> <span class="n">IS_POSIX</span><span class="p">,</span> <span class="n">IS_MAC_OS</span><span class="p">,</span> <span class="n">IS_WINDOWS</span>
 
 
-<div class="viewcode-block" id="recursive_unicode_to_str"><a class="viewcode-back" href="../../pympress.html#pympress.config.recursive_unicode_to_str">[docs]</a><span class="k">def</span> <span class="nf">recursive_unicode_to_str</span><span class="p">(</span><span class="n">obj</span><span class="p">):</span>
+<div class="viewcode-block" id="recursive_unicode_to_str"><a class="viewcode-back" href="../../pympress.html#pympress.ui.recursive_unicode_to_str">[docs]</a><span class="k">def</span> <span class="nf">recursive_unicode_to_str</span><span class="p">(</span><span class="n">obj</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot; Recursively convert unicode to str (for python2)</span>
 <span class="sd">    Raises NameError in python3 as &#39;unicode&#39; is undefined</span>
 
@@ -219,7 +219,7 @@ <h1>Source code for pympress.config</h1><div class="highlight"><pre>
         <span class="k">return</span> <span class="n">obj</span></div>
 
 
-<div class="viewcode-block" id="layout_from_json"><a class="viewcode-back" href="../../pympress.html#pympress.config.layout_from_json">[docs]</a><span class="k">def</span> <span class="nf">layout_from_json</span><span class="p">(</span><span class="n">layout_string</span><span class="p">):</span>
+<div class="viewcode-block" id="layout_from_json"><a class="viewcode-back" href="../../pympress.html#pympress.ui.layout_from_json">[docs]</a><span class="k">def</span> <span class="nf">layout_from_json</span><span class="p">(</span><span class="n">layout_string</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot; Load the layout from config, with all strings cast to type `str` (even on python2 where they default to `unicode`)</span>
 <span class="sd">    Raises ValueError until python 3.4, json.decoder.JSONDecodeError afterwards, on invalid input.</span>
 
@@ -239,7 +239,7 @@ <h1>Source code for pympress.config</h1><div class="highlight"><pre>
     <span class="k">return</span> <span class="n">layout</span></div>
 
 
-<div class="viewcode-block" id="Config"><a class="viewcode-back" href="../../pympress.html#pympress.config.Config">[docs]</a><span class="k">class</span> <span class="nc">Config</span><span class="p">(</span><span class="n">configparser</span><span class="o">.</span><span class="n">ConfigParser</span><span class="p">):</span>
+<div class="viewcode-block" id="Config"><a class="viewcode-back" href="../../pympress.html#pympress.ui.Config">[docs]</a><span class="k">class</span> <span class="nc">Config</span><span class="p">(</span><span class="n">configparser</span><span class="o">.</span><span class="n">ConfigParser</span><span class="p">,</span> <span class="nb">object</span><span class="p">):</span> <span class="c1"># python 2 fix</span>
     <span class="sd">&quot;&quot;&quot; Manage configuration :Get the configuration from its file and store its back.</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="c1">#: `dict`-tree of presenter layout for the notes mode</span>
@@ -250,7 +250,7 @@ <h1>Source code for pympress.config</h1><div class="highlight"><pre>
     <span class="c1">#: Set of strings that are the valid names of widgets from the presenter window that can be dynamically rearranged</span>
     <span class="n">placeable_widgets</span> <span class="o">=</span> <span class="p">{</span><span class="s2">&quot;notes&quot;</span><span class="p">,</span> <span class="s2">&quot;current&quot;</span><span class="p">,</span> <span class="s2">&quot;next&quot;</span><span class="p">,</span> <span class="s2">&quot;annotations&quot;</span><span class="p">}</span>
 
-<div class="viewcode-block" id="Config.path_to_config"><a class="viewcode-back" href="../../pympress.html#pympress.config.Config.path_to_config">[docs]</a>    <span class="nd">@staticmethod</span>
+<div class="viewcode-block" id="Config.path_to_config"><a class="viewcode-back" href="../../pympress.html#pympress.ui.Config.path_to_config">[docs]</a>    <span class="nd">@staticmethod</span>
     <span class="k">def</span> <span class="nf">path_to_config</span><span class="p">():</span>
         <span class="sd">&quot;&quot;&quot; Return the OS-specific path to the configuration file.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
@@ -331,7 +331,7 @@ <h1>Source code for pympress.config</h1><div class="highlight"><pre>
         <span class="n">config</span><span class="o">.</span><span class="n">load_window_layouts</span><span class="p">()</span>
 
 
-<div class="viewcode-block" id="Config.save_config"><a class="viewcode-back" href="../../pympress.html#pympress.config.Config.save_config">[docs]</a>    <span class="k">def</span> <span class="nf">save_config</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+<div class="viewcode-block" id="Config.save_config"><a class="viewcode-back" href="../../pympress.html#pympress.ui.Config.save_config">[docs]</a>    <span class="k">def</span> <span class="nf">save_config</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Save the configuration to its file.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="c1"># serialize the layouts</span>
@@ -342,7 +342,7 @@ <h1>Source code for pympress.config</h1><div class="highlight"><pre>
             <span class="bp">self</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="n">configfile</span><span class="p">)</span></div>
 
 
-<div class="viewcode-block" id="Config.toggle_start"><a class="viewcode-back" href="../../pympress.html#pympress.config.Config.toggle_start">[docs]</a>    <span class="k">def</span> <span class="nf">toggle_start</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">check_item</span><span class="p">):</span>
+<div class="viewcode-block" id="Config.toggle_start"><a class="viewcode-back" href="../../pympress.html#pympress.ui.Config.toggle_start">[docs]</a>    <span class="k">def</span> <span class="nf">toggle_start</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">check_item</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Generic function to toggle some boolean startup configuration.</span>
 
 <span class="sd">        Args:</span>
@@ -352,7 +352,7 @@ <h1>Source code for pympress.config</h1><div class="highlight"><pre>
         <span class="bp">self</span><span class="o">.</span><span class="n">set</span><span class="p">(</span><span class="n">window</span><span class="p">,</span> <span class="n">start_conf</span><span class="p">,</span> <span class="s1">&#39;on&#39;</span> <span class="k">if</span> <span class="n">check_item</span><span class="o">.</span><span class="n">get_active</span><span class="p">()</span> <span class="k">else</span> <span class="s1">&#39;off&#39;</span><span class="p">)</span></div>
 
 
-<div class="viewcode-block" id="Config.validate_layout"><a class="viewcode-back" href="../../pympress.html#pympress.config.Config.validate_layout">[docs]</a>    <span class="k">def</span> <span class="nf">validate_layout</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">layout</span><span class="p">,</span> <span class="n">expected_widgets</span><span class="p">):</span>
+<div class="viewcode-block" id="Config.validate_layout"><a class="viewcode-back" href="../../pympress.html#pympress.ui.Config.validate_layout">[docs]</a>    <span class="k">def</span> <span class="nf">validate_layout</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">layout</span><span class="p">,</span> <span class="n">expected_widgets</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Validate layout: check whether the layout of widgets built from the config string is valid.</span>
 
 <span class="sd">        Args:</span>
@@ -404,7 +404,7 @@ <h1>Source code for pympress.config</h1><div class="highlight"><pre>
             <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s1">&#39;Following placeable_widgets were not specified: </span><span class="si">{}</span><span class="s1">&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="s1">&#39;, &#39;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">widget_missing</span><span class="p">)))</span></div>
 
 
-<div class="viewcode-block" id="Config.load_window_layouts"><a class="viewcode-back" href="../../pympress.html#pympress.config.Config.load_window_layouts">[docs]</a>    <span class="k">def</span> <span class="nf">load_window_layouts</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+<div class="viewcode-block" id="Config.load_window_layouts"><a class="viewcode-back" href="../../pympress.html#pympress.ui.Config.load_window_layouts">[docs]</a>    <span class="k">def</span> <span class="nf">load_window_layouts</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Parse and validate layouts loaded from config, with fallbacks if needed.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="n">default_notes_layout</span> <span class="o">=</span> <span class="s1">&#39;{&quot;resizeable&quot;:true, &quot;orientation&quot;:&quot;horizontal&quot;, &quot;children&quot;:[&quot;notes&quot;, {&quot;resizeable&quot;:false, &quot;children&quot;:[&quot;current&quot;, &quot;next&quot;], &quot;orientation&quot;:&quot;vertical&quot;}], &quot;proportions&quot;: [0.60, 0.40]}&#39;</span>
@@ -426,7 +426,7 @@ <h1>Source code for pympress.config</h1><div class="highlight"><pre>
             <span class="bp">self</span><span class="o">.</span><span class="n">plain_layout</span> <span class="o">=</span> <span class="n">layout_from_json</span><span class="p">(</span><span class="n">default_plain_layout</span><span class="p">)</span></div>
 
 
-<div class="viewcode-block" id="Config.widget_layout_to_tree"><a class="viewcode-back" href="../../pympress.html#pympress.config.Config.widget_layout_to_tree">[docs]</a>    <span class="k">def</span> <span class="nf">widget_layout_to_tree</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget</span><span class="p">,</span> <span class="n">pane_handle_pos</span><span class="p">):</span>
+<div class="viewcode-block" id="Config.widget_layout_to_tree"><a class="viewcode-back" href="../../pympress.html#pympress.ui.Config.widget_layout_to_tree">[docs]</a>    <span class="k">def</span> <span class="nf">widget_layout_to_tree</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget</span><span class="p">,</span> <span class="n">pane_handle_pos</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Build a tree representing a widget hierarchy, leaves are strings and nodes are `dict`.</span>
 <span class="sd">        Recursive function. See validate_layout() for more info on the tree structure.</span>
 
@@ -481,19 +481,19 @@ <h1>Source code for pympress.config</h1><div class="highlight"><pre>
         <span class="k">return</span> <span class="n">node</span></div>
 
 
-<div class="viewcode-block" id="Config.get_notes_layout"><a class="viewcode-back" href="../../pympress.html#pympress.config.Config.get_notes_layout">[docs]</a>    <span class="k">def</span> <span class="nf">get_notes_layout</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+<div class="viewcode-block" id="Config.get_notes_layout"><a class="viewcode-back" href="../../pympress.html#pympress.ui.Config.get_notes_layout">[docs]</a>    <span class="k">def</span> <span class="nf">get_notes_layout</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Getter for the notes layout.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">notes_layout</span></div>
 
 
-<div class="viewcode-block" id="Config.get_plain_layout"><a class="viewcode-back" href="../../pympress.html#pympress.config.Config.get_plain_layout">[docs]</a>    <span class="k">def</span> <span class="nf">get_plain_layout</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+<div class="viewcode-block" id="Config.get_plain_layout"><a class="viewcode-back" href="../../pympress.html#pympress.ui.Config.get_plain_layout">[docs]</a>    <span class="k">def</span> <span class="nf">get_plain_layout</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Getter for the plain layout.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">plain_layout</span></div>
 
 
-<div class="viewcode-block" id="Config.update_notes_layout"><a class="viewcode-back" href="../../pympress.html#pympress.config.Config.update_notes_layout">[docs]</a>    <span class="k">def</span> <span class="nf">update_notes_layout</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget</span><span class="p">,</span> <span class="n">pane_handle_pos</span><span class="p">):</span>
+<div class="viewcode-block" id="Config.update_notes_layout"><a class="viewcode-back" href="../../pympress.html#pympress.ui.Config.update_notes_layout">[docs]</a>    <span class="k">def</span> <span class="nf">update_notes_layout</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget</span><span class="p">,</span> <span class="n">pane_handle_pos</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Setter for the notes layout.</span>
 
 <span class="sd">        Args:</span>
@@ -503,7 +503,7 @@ <h1>Source code for pympress.config</h1><div class="highlight"><pre>
         <span class="bp">self</span><span class="o">.</span><span class="n">notes_layout</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">widget_layout_to_tree</span><span class="p">(</span><span class="n">widget</span><span class="p">,</span> <span class="n">pane_handle_pos</span><span class="p">)</span></div>
 
 
-<div class="viewcode-block" id="Config.update_plain_layout"><a class="viewcode-back" href="../../pympress.html#pympress.config.Config.update_plain_layout">[docs]</a>    <span class="k">def</span> <span class="nf">update_plain_layout</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget</span><span class="p">,</span> <span class="n">pane_handle_pos</span><span class="p">):</span>
+<div class="viewcode-block" id="Config.update_plain_layout"><a class="viewcode-back" href="../../pympress.html#pympress.ui.Config.update_plain_layout">[docs]</a>    <span class="k">def</span> <span class="nf">update_plain_layout</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget</span><span class="p">,</span> <span class="n">pane_handle_pos</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Setter for the plain layout.</span>
 
 <span class="sd">        Args:</span>
@@ -549,7 +549,7 @@ <h1>Source code for pympress.config</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/document.html b/docs/_modules/pympress/document.html
index 76818dc2..0676b300 100644
--- a/docs/_modules/pympress/document.html
+++ b/docs/_modules/pympress/document.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -1018,7 +1018,7 @@ <h1>Source code for pympress.document</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/editable_label.html b/docs/_modules/pympress/editable_label.html
index 978e0ca8..f16e89af 100644
--- a/docs/_modules/pympress/editable_label.html
+++ b/docs/_modules/pympress/editable_label.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -215,7 +215,11 @@ <h1>Source code for pympress.editable_label</h1><div class="highlight"><pre>
 <span class="sd">            `bool`: whether the event was consumed</span>
 <span class="sd">        &quot;&quot;&quot;</span>
 
-        <span class="k">if</span> <span class="nb">issubclass</span><span class="p">(</span><span class="nb">type</span><span class="p">(</span><span class="n">widget</span><span class="p">),</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">Actionable</span><span class="p">):</span>
+        <span class="k">if</span> <span class="nb">issubclass</span><span class="p">(</span><span class="nb">type</span><span class="p">(</span><span class="n">widget</span><span class="p">),</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">CheckMenuItem</span><span class="p">)</span> <span class="ow">and</span> <span class="n">widget</span><span class="o">.</span><span class="n">get_active</span><span class="p">()</span> <span class="o">==</span> <span class="bp">self</span><span class="o">.</span><span class="n">editing</span><span class="p">:</span>
+            <span class="c1"># Checking the checkbox conforming to current situation: do nothing</span>
+            <span class="k">return</span> <span class="kc">False</span>
+
+        <span class="k">elif</span> <span class="nb">issubclass</span><span class="p">(</span><span class="nb">type</span><span class="p">(</span><span class="n">widget</span><span class="p">),</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">Actionable</span><span class="p">):</span>
             <span class="c1"># A button or menu item, etc. directly connected to this action</span>
             <span class="k">pass</span>
 
@@ -591,7 +595,7 @@ <h1>Source code for pympress.editable_label</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/extras.html b/docs/_modules/pympress/extras.html
index 33f7b7af..20f7eae7 100644
--- a/docs/_modules/pympress/extras.html
+++ b/docs/_modules/pympress/extras.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -334,7 +334,17 @@ <h1>Source code for pympress.extras</h1><div class="highlight"><pre>
 <span class="sd">            media_id (`int`): A unique idientifier of the media to start playing</span>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="k">if</span> <span class="n">media_id</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">_media_overlays</span><span class="p">:</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">_media_overlays</span><span class="p">[</span><span class="n">media_id</span><span class="p">]</span><span class="o">.</span><span class="n">play</span><span class="p">()</span></div></div>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_media_overlays</span><span class="p">[</span><span class="n">media_id</span><span class="p">]</span><span class="o">.</span><span class="n">play</span><span class="p">()</span></div>
+
+
+<div class="viewcode-block" id="Media.vlc_support_enabled"><a class="viewcode-back" href="../../pympress.html#pympress.extras.Media.vlc_support_enabled">[docs]</a>    <span class="nd">@staticmethod</span>
+    <span class="k">def</span> <span class="nf">vlc_support_enabled</span><span class="p">():</span>
+        <span class="sd">&quot;&quot;&quot; Check whether the VLC support is enabled or not.</span>
+
+<span class="sd">        Returns:</span>
+<span class="sd">            `bool`: whether vlc support is enabled</span>
+<span class="sd">        &quot;&quot;&quot;</span>
+        <span class="k">return</span> <span class="n">vlc_enabled</span></div></div>
 
 
 <div class="viewcode-block" id="Cursor"><a class="viewcode-back" href="../../pympress.html#pympress.extras.Cursor">[docs]</a><span class="k">class</span> <span class="nc">Cursor</span><span class="p">(</span><span class="nb">object</span><span class="p">):</span>
@@ -393,7 +403,7 @@ <h1>Source code for pympress.extras</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/page_number.html b/docs/_modules/pympress/page_number.html
index 71f03037..f789c565 100644
--- a/docs/_modules/pympress/page_number.html
+++ b/docs/_modules/pympress/page_number.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -191,9 +191,9 @@ <h1>Source code for pympress.page_number</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">gi.repository</span> <span class="k">import</span> <span class="n">Gtk</span><span class="p">,</span> <span class="n">Gdk</span><span class="p">,</span> <span class="n">GLib</span>
 <span class="kn">import</span> <span class="nn">time</span>
 
-<span class="kn">from</span> <span class="nn">pympress</span> <span class="k">import</span> <span class="n">callbacks</span>
+<span class="kn">from</span> <span class="nn">pympress</span> <span class="k">import</span> <span class="n">callbacks</span><span class="p">,</span> <span class="n">editable_label</span>
 
-<div class="viewcode-block" id="PageNumber"><a class="viewcode-back" href="../../pympress.html#pympress.page_number.PageNumber">[docs]</a><span class="k">class</span> <span class="nc">PageNumber</span><span class="p">(</span><span class="nb">object</span><span class="p">):</span>
+<div class="viewcode-block" id="PageNumber"><a class="viewcode-back" href="../../pympress.html#pympress.page_number.PageNumber">[docs]</a><span class="k">class</span> <span class="nc">PageNumber</span><span class="p">(</span><span class="n">editable_label</span><span class="o">.</span><span class="n">EditableLabel</span><span class="p">):</span>
     <span class="c1">#: Slide counter :class:`~Gtk.Label` for the current slide.</span>
     <span class="n">label_cur</span> <span class="o">=</span> <span class="kc">None</span>
     <span class="c1">#: Slide counter :class:`~Gtk.Label` for the last slide.</span>
@@ -202,22 +202,28 @@ <h1>Source code for pympress.page_number</h1><div class="highlight"><pre>
     <span class="n">eb_cur</span> <span class="o">=</span> <span class="kc">None</span>
     <span class="c1">#: :class:`~Gtk.HBox` containing the slide counter label in the Presenter window.</span>
     <span class="n">hb_cur</span> <span class="o">=</span> <span class="kc">None</span>
-    <span class="c1">#: forward keystrokes to the Content window even if the window manager puts Presenter on top</span>
-    <span class="n">editing_cur</span> <span class="o">=</span> <span class="kc">False</span>
     <span class="c1">#: :class:`~Gtk.SpinButton` used to switch to another slide by typing its number.</span>
     <span class="n">spin_cur</span> <span class="o">=</span> <span class="kc">None</span>
 
+    <span class="c1">#: `int` holding the maximum page number in the document</span>
+    <span class="n">max_page_number</span> <span class="o">=</span> <span class="mi">1</span>
 
-<div class="viewcode-block" id="PageNumber.setup"><a class="viewcode-back" href="../../pympress.html#pympress.page_number.PageNumber.setup">[docs]</a>    <span class="k">def</span> <span class="nf">setup</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">builder</span><span class="p">):</span>
+
+    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">builder</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Load all the widgets we need from the spinner.</span>
 
 <span class="sd">        Args:</span>
 <span class="sd">            builder (:class:`~pympress.builder.Builder`): A builder from which to load widgets</span>
 <span class="sd">        &quot;&quot;&quot;</span>
+        <span class="nb">super</span><span class="p">(</span><span class="n">PageNumber</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="fm">__init__</span><span class="p">()</span>
+
         <span class="n">builder</span><span class="o">.</span><span class="n">load_widgets</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
 
         <span class="c1"># Initially (from XML) both the spinner and the current page label are visible.</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">hb_cur</span><span class="o">.</span><span class="n">remove</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="p">)</span></div>
+        <span class="bp">self</span><span class="o">.</span><span class="n">hb_cur</span><span class="o">.</span><span class="n">remove</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="p">)</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">shortcut_key</span> <span class="o">=</span> <span class="s1">&#39;G&#39;</span>
+        <span class="n">callbacks</span><span class="o">.</span><span class="n">page_number</span> <span class="o">=</span> <span class="bp">self</span>
 
 
 <div class="viewcode-block" id="PageNumber.set_last"><a class="viewcode-back" href="../../pympress.html#pympress.page_number.PageNumber.set_last">[docs]</a>    <span class="k">def</span> <span class="nf">set_last</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">num_pages</span><span class="p">):</span>
@@ -226,97 +232,34 @@ <h1>Source code for pympress.page_number</h1><div class="highlight"><pre>
 <span class="sd">        Args:</span>
 <span class="sd">            num_pages (`int`): The maximum page number</span>
 <span class="sd">        &quot;&quot;&quot;</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">max_page_number</span> <span class="o">=</span> <span class="n">num_pages</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">label_last</span><span class="o">.</span><span class="n">set_text</span><span class="p">(</span><span class="s2">&quot;/</span><span class="si">{}</span><span class="s2">&quot;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">num_pages</span><span class="p">))</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">set_range</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="n">num_pages</span><span class="p">)</span></div>
 
 
-<div class="viewcode-block" id="PageNumber.on_label_event"><a class="viewcode-back" href="../../pympress.html#pympress.page_number.PageNumber.on_label_event">[docs]</a>    <span class="k">def</span> <span class="nf">on_label_event</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget</span><span class="p">,</span> <span class="n">event</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span> <span class="n">name</span> <span class="o">=</span> <span class="kc">None</span><span class="p">):</span>
-        <span class="sd">&quot;&quot;&quot; Manage events on the current slide label/entry.</span>
-
-<span class="sd">        This function replaces the label with an entry when clicked.</span>
-
-<span class="sd">        Args:</span>
-<span class="sd">            widget (:class:`~Gtk.Widget`):  the widget in which the event occured</span>
-<span class="sd">            event (:class:`~Gtk.Event` or None):  the event that occured, None if tf we called from a menu item</span>
-<span class="sd">            name (`str`): name of the key in the casae of a key press</span>
-
-<span class="sd">        Returns:</span>
-<span class="sd">            `bool`: whether the event was consumed</span>
+<div class="viewcode-block" id="PageNumber.validate"><a class="viewcode-back" href="../../pympress.html#pympress.page_number.PageNumber.validate">[docs]</a>    <span class="k">def</span> <span class="nf">validate</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot; Get the page number from the spinner and go to that page</span>
 <span class="sd">        &quot;&quot;&quot;</span>
+        <span class="k">try</span><span class="p">:</span>
+            <span class="n">page_nb</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">get_buffer</span><span class="p">()</span><span class="o">.</span><span class="n">get_text</span><span class="p">())</span> <span class="o">-</span> <span class="mi">1</span>
+        <span class="k">except</span><span class="p">:</span>
+            <span class="n">page_nb</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">get_value</span><span class="p">())</span> <span class="o">-</span> <span class="mi">1</span>
+        <span class="n">callbacks</span><span class="o">.</span><span class="n">ui</span><span class="o">.</span><span class="n">goto_page</span><span class="p">(</span><span class="n">page_nb</span><span class="p">)</span></div>
 
-        <span class="k">if</span> <span class="nb">issubclass</span><span class="p">(</span><span class="nb">type</span><span class="p">(</span><span class="n">widget</span><span class="p">),</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">Actionable</span><span class="p">):</span>
-            <span class="c1"># A button or menu item, etc. directly connected to this action</span>
-            <span class="k">pass</span>
-
-        <span class="k">elif</span> <span class="n">event</span><span class="o">.</span><span class="n">type</span> <span class="o">==</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">EventType</span><span class="o">.</span><span class="n">KEY_PRESS</span><span class="p">:</span>
-            <span class="k">if</span> <span class="n">name</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
-                <span class="n">name</span> <span class="o">=</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">keyval_name</span><span class="p">(</span><span class="n">event</span><span class="o">.</span><span class="n">keyval</span><span class="p">)</span>
-            <span class="k">if</span> <span class="n">name</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">!=</span> <span class="s1">&#39;G&#39;</span><span class="p">:</span>
-                <span class="k">return</span> <span class="kc">False</span>
-
-        <span class="k">elif</span> <span class="n">event</span><span class="o">.</span><span class="n">type</span> <span class="o">==</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">EventType</span><span class="o">.</span><span class="n">BUTTON_PRESS</span><span class="p">:</span>
-            <span class="c1"># If we clicked on the Event Box then don&#39;t toggle, just enable.</span>
-            <span class="k">if</span> <span class="n">widget</span> <span class="ow">is</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">eb_cur</span> <span class="ow">or</span> <span class="bp">self</span><span class="o">.</span><span class="n">editing_cur</span><span class="p">:</span>
-                <span class="k">return</span> <span class="kc">False</span>
-        <span class="k">else</span><span class="p">:</span>
-            <span class="k">return</span> <span class="kc">False</span>
-
-        <span class="c1"># Perform the state toggle</span>
-
-        <span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">editing_cur</span><span class="p">:</span>
-            <span class="n">callbacks</span><span class="o">.</span><span class="n">UICallbacks</span><span class="o">.</span><span class="n">stop_editing_time</span><span class="p">()</span>
-
-            <span class="c1"># Replace label with entry</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">hb_cur</span><span class="o">.</span><span class="n">remove</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">label_cur</span><span class="p">)</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">show</span><span class="p">()</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">hb_cur</span><span class="o">.</span><span class="n">add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="p">)</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">hb_cur</span><span class="o">.</span><span class="n">reorder_child</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">grab_focus</span><span class="p">()</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">editing_cur</span> <span class="o">=</span> <span class="kc">True</span>
-
-            <span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">set_value</span><span class="p">(</span><span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">label_cur</span><span class="o">.</span><span class="n">get_text</span><span class="p">()))</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">select_region</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="o">-</span><span class="mi">1</span><span class="p">)</span>
-
-        <span class="k">else</span><span class="p">:</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">restore_current_label</span><span class="p">()</span>
-
-        <span class="k">return</span> <span class="kc">True</span></div>
-
-
-<div class="viewcode-block" id="PageNumber.on_spin_nav"><a class="viewcode-back" href="../../pympress.html#pympress.page_number.PageNumber.on_spin_nav">[docs]</a>    <span class="k">def</span> <span class="nf">on_spin_nav</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget</span><span class="p">,</span> <span class="n">event</span><span class="p">):</span>
-        <span class="sd">&quot;&quot;&quot; Manage key presses for the spinner.</span>
-
-<span class="sd">        We check the event for any specific behaviour we want: validating, updating, or cancelling navigation,</span>
-<span class="sd">        and otherwise fall back to the spin button&#39;s normal behaviour.</span>
-
-<span class="sd">        Args:</span>
-<span class="sd">            widget (:class:`~Gtk.Widget`):  the widget which has received the event.</span>
-<span class="sd">            event (:class:`~Gdk.Event`):  the GTK event.</span>
 
-<span class="sd">        Returns:</span>
-<span class="sd">            `bool`: whether the event was consumed</span>
+<div class="viewcode-block" id="PageNumber.cancel"><a class="viewcode-back" href="../../pympress.html#pympress.page_number.PageNumber.cancel">[docs]</a>    <span class="k">def</span> <span class="nf">cancel</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot; Make the UI re-display the pages from before editing the current page.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">editing_cur</span> <span class="ow">or</span> <span class="n">event</span><span class="o">.</span><span class="n">type</span> <span class="o">!=</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">EventType</span><span class="o">.</span><span class="n">KEY_PRESS</span><span class="p">:</span>
-            <span class="k">return</span> <span class="kc">False</span>
-
-        <span class="n">name</span> <span class="o">=</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">keyval_name</span><span class="p">(</span><span class="n">event</span><span class="o">.</span><span class="n">keyval</span><span class="p">)</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s1">&#39;kp_&#39;</span><span class="p">,</span> <span class="s1">&#39;&#39;</span><span class="p">)</span>
-
-        <span class="k">if</span> <span class="n">name</span> <span class="o">==</span> <span class="s1">&#39;return&#39;</span> <span class="ow">or</span> <span class="n">name</span> <span class="o">==</span> <span class="s1">&#39;enter&#39;</span><span class="p">:</span>
-            <span class="k">try</span><span class="p">:</span>
-                <span class="n">page_nb</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">get_buffer</span><span class="p">()</span><span class="o">.</span><span class="n">get_text</span><span class="p">())</span> <span class="o">-</span> <span class="mi">1</span>
-            <span class="k">except</span><span class="p">:</span>
-                <span class="n">page_nb</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">get_value</span><span class="p">())</span> <span class="o">-</span> <span class="mi">1</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">doc</span><span class="o">.</span><span class="n">goto</span><span class="p">(</span><span class="n">page_nb</span><span class="p">)</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">restore_current_label</span><span class="p">()</span>
+        <span class="n">GLib</span><span class="o">.</span><span class="n">idle_add</span><span class="p">(</span><span class="n">callbacks</span><span class="o">.</span><span class="n">ui</span><span class="o">.</span><span class="n">on_page_change</span><span class="p">,</span> <span class="kc">False</span><span class="p">)</span></div>
 
-        <span class="k">elif</span> <span class="n">name</span> <span class="o">==</span> <span class="s1">&#39;escape&#39;</span><span class="p">:</span>
-            <span class="n">GLib</span><span class="o">.</span><span class="n">idle_add</span><span class="p">(</span><span class="n">callbacks</span><span class="o">.</span><span class="n">UICallbacks</span><span class="o">.</span><span class="n">notify_page_change</span><span class="p">,</span> <span class="kc">False</span><span class="p">)</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">restore_current_label</span><span class="p">()</span>
 
-        <span class="k">elif</span> <span class="n">name</span> <span class="o">==</span> <span class="s1">&#39;home&#39;</span><span class="p">:</span>
+<div class="viewcode-block" id="PageNumber.more_actions"><a class="viewcode-back" href="../../pympress.html#pympress.page_number.PageNumber.more_actions">[docs]</a>    <span class="k">def</span> <span class="nf">more_actions</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">event</span><span class="p">,</span> <span class="n">name</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot; Implement directions (left/right/home/end) keystrokes, otherwise pass on to :func:`~Gtk.SpinButton.do_key_press_event()`</span>
+<span class="sd">        &quot;&quot;&quot;</span>
+        <span class="k">if</span> <span class="n">name</span> <span class="o">==</span> <span class="s1">&#39;home&#39;</span><span class="p">:</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">set_value</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
         <span class="k">elif</span> <span class="n">name</span> <span class="o">==</span> <span class="s1">&#39;end&#39;</span><span class="p">:</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">set_value</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">doc</span><span class="o">.</span><span class="n">pages_number</span><span class="p">())</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">set_value</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">max_page_number</span><span class="p">)</span>
         <span class="k">elif</span> <span class="n">name</span> <span class="o">==</span> <span class="s1">&#39;left&#39;</span><span class="p">:</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">set_value</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">get_value</span><span class="p">()</span> <span class="o">-</span> <span class="mi">1</span><span class="p">)</span>
         <span class="k">elif</span> <span class="n">name</span> <span class="o">==</span> <span class="s1">&#39;right&#39;</span><span class="p">:</span>
@@ -337,13 +280,31 @@ <h1>Source code for pympress.page_number</h1><div class="highlight"><pre>
 <span class="sd">        Returns:</span>
 <span class="sd">            `bool`: whether the event was consumed</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">editing_cur</span><span class="p">:</span>
+        <span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">editing</span><span class="p">:</span>
             <span class="k">return</span> <span class="kc">False</span>
         <span class="k">else</span><span class="p">:</span>
             <span class="k">return</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">SpinButton</span><span class="o">.</span><span class="n">do_scroll_event</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="p">,</span> <span class="n">event</span><span class="p">)</span></div>
 
 
-<div class="viewcode-block" id="PageNumber.restore_current_label"><a class="viewcode-back" href="../../pympress.html#pympress.page_number.PageNumber.restore_current_label">[docs]</a>    <span class="k">def</span> <span class="nf">restore_current_label</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+<div class="viewcode-block" id="PageNumber.swap_label_for_entry"><a class="viewcode-back" href="../../pympress.html#pympress.page_number.PageNumber.swap_label_for_entry">[docs]</a>    <span class="k">def</span> <span class="nf">swap_label_for_entry</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot; Perform the actual work of starting the editing.</span>
+<span class="sd">        &quot;&quot;&quot;</span>
+        <span class="n">callbacks</span><span class="o">.</span><span class="n">talk_time</span><span class="o">.</span><span class="n">stop_editing</span><span class="p">()</span>
+
+        <span class="c1"># Replace label with entry</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">hb_cur</span><span class="o">.</span><span class="n">remove</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">label_cur</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">show</span><span class="p">()</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">hb_cur</span><span class="o">.</span><span class="n">add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">hb_cur</span><span class="o">.</span><span class="n">reorder_child</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">grab_focus</span><span class="p">()</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">set_value</span><span class="p">(</span><span class="nb">int</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">label_cur</span><span class="o">.</span><span class="n">get_text</span><span class="p">()))</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">spin_cur</span><span class="o">.</span><span class="n">select_region</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="o">-</span><span class="mi">1</span><span class="p">)</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">editing</span> <span class="o">=</span> <span class="kc">True</span></div>
+
+
+<div class="viewcode-block" id="PageNumber.restore_label"><a class="viewcode-back" href="../../pympress.html#pympress.page_number.PageNumber.restore_label">[docs]</a>    <span class="k">def</span> <span class="nf">restore_label</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Make sure that the current page number is displayed in a label and not in an entry.</span>
 <span class="sd">        If it is an entry, then replace it with the label.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
@@ -352,7 +313,7 @@ <h1>Source code for pympress.page_number</h1><div class="highlight"><pre>
             <span class="bp">self</span><span class="o">.</span><span class="n">hb_cur</span><span class="o">.</span><span class="n">pack_start</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">label_cur</span><span class="p">,</span> <span class="kc">True</span><span class="p">,</span> <span class="kc">True</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">hb_cur</span><span class="o">.</span><span class="n">reorder_child</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">label_cur</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
 
-        <span class="bp">self</span><span class="o">.</span><span class="n">editing_cur</span> <span class="o">=</span> <span class="kc">False</span></div>
+        <span class="bp">self</span><span class="o">.</span><span class="n">editing</span> <span class="o">=</span> <span class="kc">False</span></div>
 
 
 <div class="viewcode-block" id="PageNumber.update_page_numbers"><a class="viewcode-back" href="../../pympress.html#pympress.page_number.PageNumber.update_page_numbers">[docs]</a>    <span class="k">def</span> <span class="nf">update_page_numbers</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">cur_nb</span><span class="p">):</span>
@@ -364,7 +325,7 @@ <h1>Source code for pympress.page_number</h1><div class="highlight"><pre>
         <span class="n">cur</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="n">cur_nb</span><span class="o">+</span><span class="mi">1</span><span class="p">)</span>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">label_cur</span><span class="o">.</span><span class="n">set_text</span><span class="p">(</span><span class="n">cur</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">restore_current_label</span><span class="p">()</span></div></div>
+        <span class="bp">self</span><span class="o">.</span><span class="n">restore_label</span><span class="p">()</span></div></div>
 
 
 </pre></div>
@@ -403,7 +364,7 @@ <h1>Source code for pympress.page_number</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/pointer.html b/docs/_modules/pympress/pointer.html
index 137d449e..6c07b043 100644
--- a/docs/_modules/pympress/pointer.html
+++ b/docs/_modules/pympress/pointer.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -364,7 +364,7 @@ <h1>Source code for pympress.pointer</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/scribble.html b/docs/_modules/pympress/scribble.html
index a0684c3b..8e1deba9 100644
--- a/docs/_modules/pympress/scribble.html
+++ b/docs/_modules/pympress/scribble.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -227,6 +227,9 @@ <h1>Source code for pympress.scribble</h1><div class="highlight"><pre>
     <span class="c1">#: :class:`~Gtk.Box` in the Presenter window, where we insert scribbling.</span>
     <span class="n">p_central</span> <span class="o">=</span> <span class="kc">None</span>
 
+    <span class="c1">#: :class:`~Gtk.CheckMenuItem` that shows whether the scribbling is toggled</span>
+    <span class="n">pres_highlight</span> <span class="o">=</span> <span class="kc">None</span>
+
     <span class="c1">#: :class:`~pympress.surfacecache.SurfaceCache` instance.</span>
     <span class="n">cache</span> <span class="o">=</span> <span class="kc">None</span>
 
@@ -261,7 +264,7 @@ <h1>Source code for pympress.scribble</h1><div class="highlight"><pre>
         <span class="bp">self</span><span class="o">.</span><span class="n">scribble_color</span> <span class="o">=</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">RGBA</span><span class="p">()</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">scribble_color</span><span class="o">.</span><span class="n">parse</span><span class="p">(</span><span class="n">config</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;scribble&#39;</span><span class="p">,</span> <span class="s1">&#39;color&#39;</span><span class="p">))</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">scribble_width</span> <span class="o">=</span> <span class="n">config</span><span class="o">.</span><span class="n">getint</span><span class="p">(</span><span class="s1">&#39;scribble&#39;</span><span class="p">,</span> <span class="s1">&#39;width&#39;</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="s2">&quot;scribble_p_da&quot;</span><span class="p">,</span> <span class="n">PDF_CONTENT_PAGE</span> <span class="k">if</span> <span class="n">notes_mode</span> <span class="k">else</span> <span class="n">PDF_REGULAR</span><span class="p">,</span> <span class="kc">False</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">scribble_p_da</span><span class="p">,</span> <span class="n">PDF_CONTENT_PAGE</span> <span class="k">if</span> <span class="n">notes_mode</span> <span class="k">else</span> <span class="n">PDF_REGULAR</span><span class="p">,</span> <span class="kc">False</span><span class="p">)</span>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">config</span> <span class="o">=</span> <span class="n">config</span>
 
@@ -449,7 +452,11 @@ <h1>Source code for pympress.scribble</h1><div class="highlight"><pre>
 <span class="sd">        Returns:</span>
 <span class="sd">            `bool`: whether the event was consumed</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">if</span> <span class="nb">issubclass</span><span class="p">(</span><span class="nb">type</span><span class="p">(</span><span class="n">widget</span><span class="p">),</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">Actionable</span><span class="p">):</span>
+        <span class="k">if</span> <span class="nb">issubclass</span><span class="p">(</span><span class="nb">type</span><span class="p">(</span><span class="n">widget</span><span class="p">),</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">CheckMenuItem</span><span class="p">)</span> <span class="ow">and</span> <span class="n">widget</span><span class="o">.</span><span class="n">get_active</span><span class="p">()</span> <span class="o">==</span> <span class="bp">self</span><span class="o">.</span><span class="n">scribbling_mode</span><span class="p">:</span>
+            <span class="c1"># Checking the checkbox conforming to current situation: do nothing</span>
+            <span class="k">return</span> <span class="kc">False</span>
+
+        <span class="k">elif</span> <span class="nb">issubclass</span><span class="p">(</span><span class="nb">type</span><span class="p">(</span><span class="n">widget</span><span class="p">),</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">Actionable</span><span class="p">):</span>
             <span class="c1"># A button or menu item, etc. directly connected to this action</span>
             <span class="k">pass</span>
 
@@ -499,6 +506,7 @@ <h1>Source code for pympress.scribble</h1><div class="highlight"><pre>
         <span class="bp">self</span><span class="o">.</span><span class="n">c_overlay</span><span class="o">.</span><span class="n">show_all</span><span class="p">()</span>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">scribbling_mode</span> <span class="o">=</span> <span class="kc">True</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">pres_highlight</span><span class="o">.</span><span class="n">set_active</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">scribbling_mode</span><span class="p">)</span>
 
         <span class="k">return</span> <span class="kc">True</span></div>
 
@@ -520,6 +528,7 @@ <h1>Source code for pympress.scribble</h1><div class="highlight"><pre>
         <span class="bp">self</span><span class="o">.</span><span class="n">off_render</span><span class="o">.</span><span class="n">add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">scribble_overlay</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">p_central</span><span class="o">.</span><span class="n">pack_start</span><span class="p">(</span><span class="n">p_layout</span><span class="p">,</span> <span class="kc">True</span><span class="p">,</span> <span class="kc">True</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">scribbling_mode</span> <span class="o">=</span> <span class="kc">False</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">pres_highlight</span><span class="o">.</span><span class="n">set_active</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">scribbling_mode</span><span class="p">)</span>
 
         <span class="k">return</span> <span class="kc">True</span></div></div>
 
@@ -560,7 +569,7 @@ <h1>Source code for pympress.scribble</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/surfacecache.html b/docs/_modules/pympress/surfacecache.html
index ccd2f3ce..43a3e1c2 100644
--- a/docs/_modules/pympress/surfacecache.html
+++ b/docs/_modules/pympress/surfacecache.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -231,6 +231,10 @@ <h1>Source code for pympress.surfacecache</h1><div class="highlight"><pre>
     <span class="c1">#: popped from the start of the cache.</span>
     <span class="n">surface_cache</span> <span class="o">=</span> <span class="p">{}</span>
 
+    <span class="c1">#: `dict` containing functions that return a :class:`~cairo.Surface` given a :class:`~cairo.Context`, width `int` and height `int`</span>
+    <span class="c1">#: see :func:`~cairo.Surface.create_similar`</span>
+    <span class="n">surface_factory</span> <span class="o">=</span> <span class="p">{}</span>
+
     <span class="c1">#: Size of the different managed widgets, as a `dict` of tuples</span>
     <span class="n">surface_size</span> <span class="o">=</span> <span class="p">{}</span>
 
@@ -263,21 +267,23 @@ <h1>Source code for pympress.surfacecache</h1><div class="highlight"><pre>
         <span class="bp">self</span><span class="o">.</span><span class="n">doc_lock</span> <span class="o">=</span> <span class="n">threading</span><span class="o">.</span><span class="n">Lock</span><span class="p">()</span>
 
 
-<div class="viewcode-block" id="SurfaceCache.add_widget"><a class="viewcode-back" href="../../pympress.html#pympress.surfacecache.SurfaceCache.add_widget">[docs]</a>    <span class="k">def</span> <span class="nf">add_widget</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget_name</span><span class="p">,</span> <span class="n">wtype</span><span class="p">,</span> <span class="n">start_enabled</span> <span class="o">=</span> <span class="kc">True</span><span class="p">):</span>
+<div class="viewcode-block" id="SurfaceCache.add_widget"><a class="viewcode-back" href="../../pympress.html#pympress.surfacecache.SurfaceCache.add_widget">[docs]</a>    <span class="k">def</span> <span class="nf">add_widget</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget</span><span class="p">,</span> <span class="n">wtype</span><span class="p">,</span> <span class="n">start_enabled</span> <span class="o">=</span> <span class="kc">True</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Add a widget to the list of widgets that have to be managed (for caching and prerendering).</span>
 
 <span class="sd">        This creates new entries for ``widget_name`` in the needed internal data</span>
 <span class="sd">        structures, and creates a new thread for prerendering pages for this widget.</span>
 
 <span class="sd">        Args:</span>
-<span class="sd">            widget_name (`str`):  string used to identify a widget</span>
+<span class="sd">            widget (:class:`~Gtk.Widget`):  The widget for which we need to cache</span>
 <span class="sd">            wtype (`int`):  type of document handled by the widget (see :attr:`surface_type`)</span>
 <span class="sd">            start_enabled (`bool`):  whether this widget is initially in the list of widgets to prerender</span>
 <span class="sd">        &quot;&quot;&quot;</span>
+        <span class="n">widget_name</span> <span class="o">=</span> <span class="n">widget</span><span class="o">.</span><span class="n">get_name</span><span class="p">()</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">surface_cache</span><span class="p">[</span><span class="n">widget_name</span><span class="p">]</span> <span class="o">=</span> <span class="n">OrderedDict</span><span class="p">()</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">surface_size</span><span class="p">[</span><span class="n">widget_name</span><span class="p">]</span> <span class="o">=</span> <span class="p">(</span><span class="o">-</span><span class="mi">1</span><span class="p">,</span> <span class="o">-</span><span class="mi">1</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">surface_type</span><span class="p">[</span><span class="n">widget_name</span><span class="p">]</span> <span class="o">=</span> <span class="n">wtype</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">locks</span><span class="p">[</span><span class="n">widget_name</span><span class="p">]</span> <span class="o">=</span> <span class="n">threading</span><span class="o">.</span><span class="n">Lock</span><span class="p">()</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">surface_factory</span><span class="p">[</span><span class="n">widget_name</span><span class="p">]</span> <span class="o">=</span> <span class="k">lambda</span> <span class="n">c</span><span class="p">,</span> <span class="n">w</span><span class="p">,</span> <span class="n">h</span><span class="p">:</span> <span class="n">widget</span><span class="o">.</span><span class="n">get_window</span><span class="p">()</span><span class="o">.</span><span class="n">create_similar_surface</span><span class="p">(</span><span class="n">c</span><span class="p">,</span> <span class="n">w</span><span class="p">,</span> <span class="n">h</span><span class="p">)</span>
         <span class="k">if</span> <span class="n">start_enabled</span><span class="p">:</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">enable_prerender</span><span class="p">(</span><span class="n">widget_name</span><span class="p">)</span></div>
 
@@ -413,7 +419,7 @@ <h1>Source code for pympress.surfacecache</h1><div class="highlight"><pre>
 <span class="sd">        - check if the job&#39;s result is not already available in the cache</span>
 <span class="sd">        - render it in a new :class:`~cairo.ImageSurface` if necessary</span>
 <span class="sd">        - store it in the cache if it was not added there since the beginning of</span>
-<span class="sd">          the process</span>
+<span class="sd">          the process and the widget configuration is still valid</span>
 
 <span class="sd">        Args:</span>
 <span class="sd">            widget_name (`str`):  name of the concerned widget</span>
@@ -436,9 +442,12 @@ <h1>Source code for pympress.surfacecache</h1><div class="highlight"><pre>
             <span class="n">pw</span><span class="p">,</span> <span class="n">ph</span> <span class="o">=</span> <span class="n">page</span><span class="o">.</span><span class="n">get_size</span><span class="p">(</span><span class="n">wtype</span><span class="p">)</span>
 
         <span class="c1"># Render to a ImageSurface</span>
-        <span class="c1"># 32 to support alpha (needed with premultiplied values?)</span>
-        <span class="c1"># Anyway 24 uses 32-bit values with 8 unused</span>
-        <span class="n">surface</span> <span class="o">=</span> <span class="n">cairo</span><span class="o">.</span><span class="n">ImageSurface</span><span class="p">(</span><span class="n">cairo</span><span class="o">.</span><span class="n">FORMAT_ARGB32</span><span class="p">,</span> <span class="n">ww</span><span class="p">,</span> <span class="n">wh</span><span class="p">)</span>
+        <span class="k">try</span><span class="p">:</span>
+            <span class="n">surface</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">surface_factory</span><span class="p">[</span><span class="n">widget_name</span><span class="p">](</span><span class="n">cairo</span><span class="o">.</span><span class="n">CONTENT_COLOR</span><span class="p">,</span> <span class="n">ww</span><span class="p">,</span> <span class="n">wh</span><span class="p">)</span>
+        <span class="k">except</span> <span class="ne">AttributeError</span><span class="p">:</span>
+            <span class="n">logger</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span><span class="s1">&#39;Widget </span><span class="si">{}</span><span class="s1"> was not mapped when rendering&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">widget_name</span><span class="p">),</span> <span class="n">exc_info</span> <span class="o">=</span> <span class="kc">True</span><span class="p">)</span>
+            <span class="k">return</span> <span class="kc">False</span>
+
         <span class="n">context</span> <span class="o">=</span> <span class="n">cairo</span><span class="o">.</span><span class="n">Context</span><span class="p">(</span><span class="n">surface</span><span class="p">)</span>
         <span class="n">page</span><span class="o">.</span><span class="n">render_cairo</span><span class="p">(</span><span class="n">context</span><span class="p">,</span> <span class="n">ww</span><span class="p">,</span> <span class="n">wh</span><span class="p">,</span> <span class="n">wtype</span><span class="p">)</span>
         <span class="k">del</span> <span class="n">context</span>
@@ -499,7 +508,7 @@ <h1>Source code for pympress.surfacecache</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/talk_time.html b/docs/_modules/pympress/talk_time.html
index aa8816bc..9eed302c 100644
--- a/docs/_modules/pympress/talk_time.html
+++ b/docs/_modules/pympress/talk_time.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -319,6 +319,8 @@ <h1>Source code for pympress.talk_time</h1><div class="highlight"><pre>
 
     <span class="c1">#: :class:`~TimeLabelColorer` that handles setting the colors of :attr:`label_time`</span>
     <span class="n">label_colorer</span> <span class="o">=</span> <span class="kc">None</span>
+    <span class="c1">#: :class:`~Gtk.CheckMenuItem` that shows whether the time is toggled</span>
+    <span class="n">pres_pause</span> <span class="o">=</span> <span class="kc">None</span>
 
     <span class="c1">#: :class:`~editable_label.EstimatedTalkTime` that handles changing the ett</span>
     <span class="n">ett</span> <span class="o">=</span> <span class="kc">None</span>
@@ -341,19 +343,20 @@ <h1>Source code for pympress.talk_time</h1><div class="highlight"><pre>
         <span class="n">GObject</span><span class="o">.</span><span class="n">timeout_add</span><span class="p">(</span><span class="mi">250</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">update_time</span><span class="p">)</span>
 
 
-<div class="viewcode-block" id="TimeCounter.switch_pause"><a class="viewcode-back" href="../../pympress.html#pympress.talk_time.TimeCounter.switch_pause">[docs]</a>    <span class="k">def</span> <span class="nf">switch_pause</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">):</span>
+<div class="viewcode-block" id="TimeCounter.switch_pause"><a class="viewcode-back" href="../../pympress.html#pympress.talk_time.TimeCounter.switch_pause">[docs]</a>    <span class="k">def</span> <span class="nf">switch_pause</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget</span><span class="p">,</span> <span class="n">event</span> <span class="o">=</span> <span class="kc">None</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Switch the timer between paused mode and running (normal) mode.</span>
 
 <span class="sd">        Returns:</span>
 <span class="sd">            `bool`: whether the clock&#39;s pause was toggled.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
+        <span class="k">if</span> <span class="nb">issubclass</span><span class="p">(</span><span class="nb">type</span><span class="p">(</span><span class="n">widget</span><span class="p">),</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">CheckMenuItem</span><span class="p">)</span> <span class="ow">and</span> <span class="n">widget</span><span class="o">.</span><span class="n">get_active</span><span class="p">()</span> <span class="o">==</span> <span class="bp">self</span><span class="o">.</span><span class="n">paused</span><span class="p">:</span>
+            <span class="k">return</span> <span class="kc">False</span>
+
         <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">paused</span><span class="p">:</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">start_time</span> <span class="o">=</span> <span class="n">time</span><span class="o">.</span><span class="n">time</span><span class="p">()</span> <span class="o">-</span> <span class="bp">self</span><span class="o">.</span><span class="n">delta</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">paused</span> <span class="o">=</span> <span class="kc">False</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">unpause</span><span class="p">()</span>
         <span class="k">else</span><span class="p">:</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">paused</span> <span class="o">=</span> <span class="kc">True</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">update_time</span><span class="p">()</span>
-        <span class="k">return</span> <span class="kc">True</span></div>
+            <span class="bp">self</span><span class="o">.</span><span class="n">pause</span><span class="p">()</span>
+        <span class="k">return</span> <span class="kc">None</span></div>
 
 
 <div class="viewcode-block" id="TimeCounter.pause"><a class="viewcode-back" href="../../pympress.html#pympress.talk_time.TimeCounter.pause">[docs]</a>    <span class="k">def</span> <span class="nf">pause</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -362,11 +365,14 @@ <h1>Source code for pympress.talk_time</h1><div class="highlight"><pre>
 <span class="sd">        Returns:</span>
 <span class="sd">            `bool`: whether the clock&#39;s pause was toggled.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">paused</span><span class="p">:</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">switch_pause</span><span class="p">()</span>
-            <span class="k">return</span> <span class="kc">True</span>
-        <span class="k">else</span><span class="p">:</span>
-            <span class="k">return</span> <span class="kc">False</span></div>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">paused</span><span class="p">:</span>
+            <span class="k">return</span> <span class="kc">False</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">paused</span> <span class="o">=</span> <span class="kc">True</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">update_time</span><span class="p">()</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">pres_pause</span><span class="o">.</span><span class="n">set_active</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">paused</span><span class="p">)</span>
+        <span class="k">return</span> <span class="kc">True</span></div>
 
 
 <div class="viewcode-block" id="TimeCounter.unpause"><a class="viewcode-back" href="../../pympress.html#pympress.talk_time.TimeCounter.unpause">[docs]</a>    <span class="k">def</span> <span class="nf">unpause</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -375,11 +381,15 @@ <h1>Source code for pympress.talk_time</h1><div class="highlight"><pre>
 <span class="sd">        Returns:</span>
 <span class="sd">            `bool`: whether the clock&#39;s pause was toggled.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">paused</span><span class="p">:</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">switch_pause</span><span class="p">()</span>
-            <span class="k">return</span> <span class="kc">True</span>
-        <span class="k">else</span><span class="p">:</span>
-            <span class="k">return</span> <span class="kc">False</span></div>
+        <span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">paused</span><span class="p">:</span>
+            <span class="k">return</span> <span class="kc">False</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">start_time</span> <span class="o">=</span> <span class="n">time</span><span class="o">.</span><span class="n">time</span><span class="p">()</span> <span class="o">-</span> <span class="bp">self</span><span class="o">.</span><span class="n">delta</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">paused</span> <span class="o">=</span> <span class="kc">False</span>
+
+        <span class="bp">self</span><span class="o">.</span><span class="n">update_time</span><span class="p">()</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">pres_pause</span><span class="o">.</span><span class="n">set_active</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">paused</span><span class="p">)</span>
+        <span class="k">return</span> <span class="kc">True</span></div>
 
 
 <div class="viewcode-block" id="TimeCounter.reset_timer"><a class="viewcode-back" href="../../pympress.html#pympress.talk_time.TimeCounter.reset_timer">[docs]</a>    <span class="k">def</span> <span class="nf">reset_timer</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">):</span>
@@ -453,7 +463,7 @@ <h1>Source code for pympress.talk_time</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/ui.html b/docs/_modules/pympress/ui.html
index 0e7e1d2c..2a6aabb6 100644
--- a/docs/_modules/pympress/ui.html
+++ b/docs/_modules/pympress/ui.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -227,6 +227,8 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
     <span class="n">c_frame</span> <span class="o">=</span> <span class="kc">None</span>
     <span class="c1">#: :class:`~Gtk.DrawingArea` for the Content window.</span>
     <span class="n">c_da</span> <span class="o">=</span> <span class="kc">None</span>
+    <span class="c1">#: :class:`~Gtk.CheckMenuItem` that shows whether the c_win is fullscreen</span>
+    <span class="n">pres_fullscreen</span> <span class="o">=</span> <span class="kc">None</span>
 
     <span class="c1">#: Presenter window, as a :class:`~Gtk.Window` instance.</span>
     <span class="n">p_win</span> <span class="o">=</span> <span class="kc">None</span>
@@ -248,6 +250,8 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
 
     <span class="c1">#: :class:`~Gtk.Frame` for the annotations in the Presenter window.</span>
     <span class="n">p_frame_annot</span> <span class="o">=</span> <span class="kc">None</span>
+    <span class="c1">#: :class:`~Gtk.CheckMenuItem` that shows whether the annotations are toggled</span>
+    <span class="n">pres_annot</span> <span class="o">=</span> <span class="kc">None</span>
 
     <span class="c1">#: Indicates whether we should delay redraws on some drawing areas to fluidify resizing gtk.paned</span>
     <span class="n">resize_panes</span> <span class="o">=</span> <span class="kc">False</span>
@@ -256,6 +260,8 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
 
     <span class="c1">#: Whether to use notes mode or not</span>
     <span class="n">notes_mode</span> <span class="o">=</span> <span class="kc">False</span>
+    <span class="c1">#: :class:`~Gtk.CheckMenuItem` that shows whether the annotations are toggled</span>
+    <span class="n">pres_notes</span> <span class="o">=</span> <span class="kc">None</span>
 
     <span class="c1">#: Whether to display annotations or not</span>
     <span class="n">show_annotations</span> <span class="o">=</span> <span class="kc">True</span>
@@ -273,6 +279,8 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
 
     <span class="c1">#: track whether we blank the screen</span>
     <span class="n">blanked</span> <span class="o">=</span> <span class="kc">False</span>
+    <span class="c1">#: :class:`~Gtk.CheckMenuItem` that shows whether the blank mode is toggled</span>
+    <span class="n">pres_blank</span> <span class="o">=</span> <span class="kc">None</span>
 
     <span class="c1">#: Dictionary of :class:`~Gtk.Widget` from the presenter window that can be dynamically rearranged</span>
     <span class="n">placeable_widgets</span> <span class="o">=</span> <span class="p">{}</span>
@@ -366,8 +374,11 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
         <span class="bp">self</span><span class="o">.</span><span class="n">p_win</span><span class="o">.</span><span class="n">show_all</span><span class="p">()</span>
 
         <span class="c1"># Initialize doc last. Use notes mode by default if the document has notes</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">swap_document</span><span class="p">(</span><span class="n">docpath</span><span class="p">)</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">scribbler</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">swap_document</span><span class="p">(</span><span class="n">docpath</span><span class="p">)</span>
+        <span class="k">if</span> <span class="n">docpath</span><span class="p">:</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">swap_document</span><span class="p">(</span><span class="n">docpath</span><span class="p">)</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">scribbler</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">swap_document</span><span class="p">(</span><span class="n">docpath</span><span class="p">)</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="n">GLib</span><span class="o">.</span><span class="n">idle_add</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">pick_file</span><span class="p">)</span>
 
         <span class="c1"># Queue some redraws</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">c_da</span><span class="o">.</span><span class="n">queue_draw</span><span class="p">()</span>
@@ -391,7 +402,7 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
         <span class="k">else</span><span class="p">:</span>
             <span class="n">page_type</span> <span class="o">=</span> <span class="n">document</span><span class="o">.</span><span class="n">PDF_REGULAR</span>
 
-        <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="s2">&quot;c_da&quot;</span><span class="p">,</span> <span class="n">page_type</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">c_da</span><span class="p">,</span> <span class="n">page_type</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">c_frame</span><span class="o">.</span><span class="n">set_property</span><span class="p">(</span><span class="s2">&quot;ratio&quot;</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">doc</span><span class="o">.</span><span class="n">current_page</span><span class="p">()</span><span class="o">.</span><span class="n">get_aspect_ratio</span><span class="p">(</span><span class="n">page_type</span><span class="p">))</span></div>
 
 
@@ -426,13 +437,13 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
             <span class="bp">self</span><span class="o">.</span><span class="n">get_object</span><span class="p">(</span><span class="n">n</span><span class="p">)</span><span class="o">.</span><span class="n">set_active</span><span class="p">(</span><span class="n">init_checkstates</span><span class="p">[</span><span class="n">n</span><span class="p">])</span>
 
         <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">notes_mode</span><span class="p">:</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="s2">&quot;p_da_cur&quot;</span><span class="p">,</span> <span class="n">PDF_CONTENT_PAGE</span><span class="p">)</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="s2">&quot;p_da_next&quot;</span><span class="p">,</span> <span class="n">PDF_CONTENT_PAGE</span><span class="p">)</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="s2">&quot;p_da_notes&quot;</span><span class="p">,</span> <span class="n">PDF_NOTES_PAGE</span><span class="p">)</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">p_da_cur</span><span class="p">,</span> <span class="n">PDF_CONTENT_PAGE</span><span class="p">)</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">p_da_next</span><span class="p">,</span> <span class="n">PDF_CONTENT_PAGE</span><span class="p">)</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">p_da_notes</span><span class="p">,</span> <span class="n">PDF_NOTES_PAGE</span><span class="p">)</span>
         <span class="k">else</span><span class="p">:</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="s2">&quot;p_da_cur&quot;</span><span class="p">,</span> <span class="n">PDF_REGULAR</span><span class="p">)</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="s2">&quot;p_da_next&quot;</span><span class="p">,</span> <span class="n">PDF_REGULAR</span><span class="p">)</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="s2">&quot;p_da_notes&quot;</span><span class="p">,</span> <span class="n">PDF_REGULAR</span><span class="p">,</span> <span class="kc">False</span><span class="p">)</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">p_da_cur</span><span class="p">,</span> <span class="n">PDF_REGULAR</span><span class="p">)</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">p_da_next</span><span class="p">,</span> <span class="n">PDF_REGULAR</span><span class="p">)</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">add_widget</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">p_da_notes</span><span class="p">,</span> <span class="n">PDF_REGULAR</span><span class="p">,</span> <span class="kc">False</span><span class="p">)</span>
 
 
         <span class="c1"># set default value</span>
@@ -595,12 +606,13 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
 <span class="sd">        Handles clicks on the &quot;about&quot; menu.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="n">about</span> <span class="o">=</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">AboutDialog</span><span class="p">()</span>
+        <span class="n">pympress</span> <span class="o">=</span> <span class="n">util</span><span class="o">.</span><span class="n">get_pympress_meta</span><span class="p">()</span>
         <span class="n">about</span><span class="o">.</span><span class="n">set_program_name</span><span class="p">(</span><span class="s1">&#39;pympress&#39;</span><span class="p">)</span>
         <span class="n">about</span><span class="o">.</span><span class="n">set_version</span><span class="p">(</span><span class="n">pympress</span><span class="o">.</span><span class="n">__version__</span><span class="p">)</span>
         <span class="n">about</span><span class="o">.</span><span class="n">set_copyright</span><span class="p">(</span><span class="n">_</span><span class="p">(</span><span class="s1">&#39;Contributors:&#39;</span><span class="p">)</span> <span class="o">+</span> <span class="s1">&#39;</span><span class="se">\n</span><span class="s1">&#39;</span> <span class="o">+</span> <span class="n">pympress</span><span class="o">.</span><span class="n">__copyright__</span><span class="p">)</span>
         <span class="n">about</span><span class="o">.</span><span class="n">set_comments</span><span class="p">(</span><span class="n">_</span><span class="p">(</span><span class="s1">&#39;pympress is a little PDF reader written in Python using Poppler for PDF rendering and GTK for the GUI.</span><span class="se">\n</span><span class="s1">&#39;</span><span class="p">)</span>
-                         <span class="o">+</span> <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Some preferences are saved in &#39;</span><span class="p">)</span> <span class="o">+</span> <span class="n">util</span><span class="o">.</span><span class="n">Config</span><span class="o">.</span><span class="n">path_to_config</span><span class="p">()</span> <span class="o">+</span> <span class="s1">&#39;</span><span class="se">\n\n</span><span class="s1">&#39;</span>
-                         <span class="o">+</span> <span class="p">(</span><span class="n">_</span><span class="p">(</span><span class="s1">&#39;Video support using VLC is enabled.&#39;</span><span class="p">)</span> <span class="k">if</span> <span class="n">vlc_enabled</span> <span class="k">else</span> <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Video support using VLC is disabled.&#39;</span><span class="p">)))</span>
+                         <span class="o">+</span> <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Some preferences are saved in &#39;</span><span class="p">)</span> <span class="o">+</span> <span class="bp">self</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">path_to_config</span><span class="p">()</span> <span class="o">+</span> <span class="s1">&#39;</span><span class="se">\n\n</span><span class="s1">&#39;</span>
+                         <span class="o">+</span> <span class="p">(</span><span class="n">_</span><span class="p">(</span><span class="s1">&#39;Video support using VLC is enabled.&#39;</span><span class="p">)</span> <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">medias</span><span class="o">.</span><span class="n">vlc_support_enabled</span><span class="p">()</span> <span class="k">else</span> <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Video support using VLC is disabled.&#39;</span><span class="p">)))</span>
         <span class="n">about</span><span class="o">.</span><span class="n">set_website</span><span class="p">(</span><span class="s1">&#39;http://www.pympress.xyz/&#39;</span><span class="p">)</span>
         <span class="k">try</span><span class="p">:</span>
             <span class="n">about</span><span class="o">.</span><span class="n">set_logo</span><span class="p">(</span><span class="n">util</span><span class="o">.</span><span class="n">get_icon_pixbuf</span><span class="p">(</span><span class="s1">&#39;pympress-128.png&#39;</span><span class="p">))</span>
@@ -631,7 +643,7 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
 
         <span class="c1"># Use notes mode by default if the document has notes</span>
         <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">notes_mode</span> <span class="o">!=</span> <span class="bp">self</span><span class="o">.</span><span class="n">doc</span><span class="o">.</span><span class="n">has_notes</span><span class="p">():</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">switch_mode</span><span class="p">()</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">switch_mode</span><span class="p">(</span><span class="s1">&#39;swap_document&#39;</span><span class="p">,</span> <span class="n">docpath</span><span class="p">)</span>
 
         <span class="c1"># Some things that need updating</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">swap_document</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">doc</span><span class="p">)</span>
@@ -968,7 +980,7 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
         <span class="k">elif</span> <span class="n">name</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">==</span> <span class="s1">&#39;Q&#39;</span><span class="p">:</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">save_and_quit</span><span class="p">()</span>
         <span class="k">elif</span> <span class="n">name</span> <span class="o">==</span> <span class="s1">&#39;Pause&#39;</span><span class="p">:</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">talk_time</span><span class="o">.</span><span class="n">switch_pause</span><span class="p">()</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">talk_time</span><span class="o">.</span><span class="n">switch_pause</span><span class="p">(</span><span class="n">widget</span><span class="p">,</span> <span class="n">event</span><span class="p">)</span>
         <span class="k">elif</span> <span class="n">name</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">==</span> <span class="s1">&#39;R&#39;</span><span class="p">:</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">talk_time</span><span class="o">.</span><span class="n">reset_timer</span><span class="p">()</span>
 
@@ -983,11 +995,11 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
             <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">page_number</span><span class="o">.</span><span class="n">on_label_event</span><span class="p">(</span><span class="n">widget</span><span class="p">,</span> <span class="n">event</span><span class="p">,</span> <span class="n">name</span><span class="p">):</span>
                 <span class="k">return</span> <span class="kc">True</span>
             <span class="k">elif</span> <span class="n">name</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">==</span> <span class="s1">&#39;P&#39;</span><span class="p">:</span>
-                <span class="bp">self</span><span class="o">.</span><span class="n">talk_time</span><span class="o">.</span><span class="n">switch_pause</span><span class="p">()</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">talk_time</span><span class="o">.</span><span class="n">switch_pause</span><span class="p">(</span><span class="n">widget</span><span class="p">,</span> <span class="n">event</span><span class="p">)</span>
             <span class="k">elif</span> <span class="n">name</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">==</span> <span class="s1">&#39;N&#39;</span><span class="p">:</span>
-                <span class="bp">self</span><span class="o">.</span><span class="n">switch_mode</span><span class="p">()</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">switch_mode</span><span class="p">(</span><span class="n">widget</span><span class="p">,</span> <span class="n">event</span><span class="p">)</span>
             <span class="k">elif</span> <span class="n">name</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">==</span> <span class="s1">&#39;A&#39;</span><span class="p">:</span>
-                <span class="bp">self</span><span class="o">.</span><span class="n">switch_annotations</span><span class="p">()</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">switch_annotations</span><span class="p">(</span><span class="n">widget</span><span class="p">,</span> <span class="n">event</span><span class="p">)</span>
             <span class="k">elif</span> <span class="n">name</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">==</span> <span class="s1">&#39;S&#39;</span><span class="p">:</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">swap_screens</span><span class="p">()</span>
             <span class="k">elif</span> <span class="n">name</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">==</span> <span class="s1">&#39;F&#39;</span><span class="p">:</span>
@@ -996,7 +1008,7 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
                 <span class="k">else</span><span class="p">:</span>
                     <span class="bp">self</span><span class="o">.</span><span class="n">switch_fullscreen</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">c_win</span><span class="p">)</span>
             <span class="k">elif</span> <span class="n">name</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">==</span> <span class="s1">&#39;B&#39;</span><span class="p">:</span>
-                <span class="bp">self</span><span class="o">.</span><span class="n">switch_blanked</span><span class="p">()</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">switch_blanked</span><span class="p">(</span><span class="n">widget</span><span class="p">,</span> <span class="n">event</span><span class="p">)</span>
             <span class="k">elif</span> <span class="n">ctrl_pressed</span> <span class="ow">and</span> <span class="n">name</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">==</span> <span class="s1">&#39;W&#39;</span><span class="p">:</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">close_file</span><span class="p">()</span>
             <span class="k">else</span><span class="p">:</span>
@@ -1177,17 +1189,27 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">widget</span><span class="p">,</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">CheckMenuItem</span><span class="p">):</span>
             <span class="c1"># Called from menu -&gt; use c_win</span>
+            <span class="n">toggle_to</span> <span class="o">=</span> <span class="n">widget</span><span class="o">.</span><span class="n">get_active</span><span class="p">()</span>
             <span class="n">widget</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">c_win</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="n">toggle_to</span> <span class="o">=</span> <span class="kc">None</span>
 
         <span class="k">if</span> <span class="n">widget</span> <span class="o">!=</span> <span class="bp">self</span><span class="o">.</span><span class="n">c_win</span> <span class="ow">and</span> <span class="n">widget</span> <span class="o">!=</span> <span class="bp">self</span><span class="o">.</span><span class="n">p_win</span><span class="p">:</span>
             <span class="n">logger</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="n">_</span><span class="p">(</span><span class="s2">&quot;Unknow widget </span><span class="si">{}</span><span class="s2"> to be fullscreened, aborting.&quot;</span><span class="p">)</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">widget</span><span class="p">))</span>
             <span class="k">return</span> <span class="kc">False</span>
 
-        <span class="k">if</span> <span class="p">(</span><span class="n">widget</span><span class="o">.</span><span class="n">get_window</span><span class="p">()</span><span class="o">.</span><span class="n">get_state</span><span class="p">()</span> <span class="o">&amp;</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">WindowState</span><span class="o">.</span><span class="n">FULLSCREEN</span><span class="p">)</span> <span class="o">!=</span> <span class="mi">0</span><span class="p">:</span>
+        <span class="n">cur_state</span> <span class="o">=</span> <span class="p">(</span><span class="n">widget</span><span class="o">.</span><span class="n">get_window</span><span class="p">()</span><span class="o">.</span><span class="n">get_state</span><span class="p">()</span> <span class="o">&amp;</span> <span class="n">Gdk</span><span class="o">.</span><span class="n">WindowState</span><span class="o">.</span><span class="n">FULLSCREEN</span><span class="p">)</span>
+
+        <span class="k">if</span> <span class="n">cur_state</span> <span class="o">==</span> <span class="n">toggle_to</span><span class="p">:</span>
+            <span class="k">return</span>
+        <span class="k">elif</span> <span class="n">cur_state</span><span class="p">:</span>
             <span class="n">widget</span><span class="o">.</span><span class="n">unfullscreen</span><span class="p">()</span>
         <span class="k">else</span><span class="p">:</span>
             <span class="n">widget</span><span class="o">.</span><span class="n">fullscreen</span><span class="p">()</span>
 
+        <span class="k">if</span> <span class="n">widget</span> <span class="o">==</span> <span class="bp">self</span><span class="o">.</span><span class="n">c_win</span><span class="p">:</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">pres_fullscreen</span><span class="o">.</span><span class="n">set_active</span><span class="p">(</span><span class="ow">not</span> <span class="n">cur_state</span><span class="p">)</span>
+
         <span class="k">return</span> <span class="kc">True</span></div>
 
 
@@ -1299,16 +1321,30 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
             <span class="bp">self</span><span class="o">.</span><span class="n">p_win</span><span class="o">.</span><span class="n">fullscreen</span><span class="p">()</span></div>
 
 
-<div class="viewcode-block" id="UI.switch_blanked"><a class="viewcode-back" href="../../pympress.html#pympress.ui.UI.switch_blanked">[docs]</a>    <span class="k">def</span> <span class="nf">switch_blanked</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">):</span>
+<div class="viewcode-block" id="UI.switch_blanked"><a class="viewcode-back" href="../../pympress.html#pympress.ui.UI.switch_blanked">[docs]</a>    <span class="k">def</span> <span class="nf">switch_blanked</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget</span><span class="p">,</span> <span class="n">event</span> <span class="o">=</span> <span class="kc">None</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Switch the blanked mode of the content screen.</span>
+
+<span class="sd">        Returns:</span>
+<span class="sd">            `bool`: whether the mode has been toggled.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
+        <span class="k">if</span> <span class="nb">issubclass</span><span class="p">(</span><span class="nb">type</span><span class="p">(</span><span class="n">widget</span><span class="p">),</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">CheckMenuItem</span><span class="p">)</span> <span class="ow">and</span> <span class="n">widget</span><span class="o">.</span><span class="n">get_active</span><span class="p">()</span> <span class="o">==</span> <span class="bp">self</span><span class="o">.</span><span class="n">blanked</span><span class="p">:</span>
+            <span class="k">return</span> <span class="kc">False</span>
+
         <span class="bp">self</span><span class="o">.</span><span class="n">blanked</span> <span class="o">=</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">blanked</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">c_da</span><span class="o">.</span><span class="n">queue_draw</span><span class="p">()</span></div>
+        <span class="bp">self</span><span class="o">.</span><span class="n">c_da</span><span class="o">.</span><span class="n">queue_draw</span><span class="p">()</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">pres_blank</span><span class="o">.</span><span class="n">set_active</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">blanked</span><span class="p">)</span>
 
+        <span class="k">return</span> <span class="kc">True</span></div>
 
-<div class="viewcode-block" id="UI.switch_mode"><a class="viewcode-back" href="../../pympress.html#pympress.ui.UI.switch_mode">[docs]</a>    <span class="k">def</span> <span class="nf">switch_mode</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">):</span>
+<div class="viewcode-block" id="UI.switch_mode"><a class="viewcode-back" href="../../pympress.html#pympress.ui.UI.switch_mode">[docs]</a>    <span class="k">def</span> <span class="nf">switch_mode</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget</span><span class="p">,</span> <span class="n">event</span> <span class="o">=</span> <span class="kc">None</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Switch the display mode to &quot;Notes mode&quot; or &quot;Normal mode&quot; (without notes).</span>
+
+<span class="sd">        Returns:</span>
+<span class="sd">            `bool`: whether the mode has been toggled.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
+        <span class="k">if</span> <span class="nb">issubclass</span><span class="p">(</span><span class="nb">type</span><span class="p">(</span><span class="n">widget</span><span class="p">),</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">CheckMenuItem</span><span class="p">)</span> <span class="ow">and</span> <span class="n">widget</span><span class="o">.</span><span class="n">get_active</span><span class="p">()</span> <span class="o">==</span> <span class="bp">self</span><span class="o">.</span><span class="n">notes_mode</span><span class="p">:</span>
+            <span class="k">return</span> <span class="kc">False</span>
+
         <span class="bp">self</span><span class="o">.</span><span class="n">scribbler</span><span class="o">.</span><span class="n">disable_scribbling</span><span class="p">()</span>
 
         <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">notes_mode</span><span class="p">:</span>
@@ -1342,12 +1378,25 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">pane_handle_pos</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">pane_handles</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">p_central</span><span class="o">.</span><span class="n">show_all</span><span class="p">()</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">on_page_change</span><span class="p">(</span><span class="kc">False</span><span class="p">)</span></div>
+        <span class="bp">self</span><span class="o">.</span><span class="n">on_page_change</span><span class="p">(</span><span class="kc">False</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">pres_notes</span><span class="o">.</span><span class="n">set_active</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">notes_mode</span><span class="p">)</span>
 
+        <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;on switch mode:&#39;</span><span class="p">)</span>
+        <span class="k">for</span> <span class="n">n</span><span class="p">,</span> <span class="n">w</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">placeable_widgets</span><span class="o">.</span><span class="n">items</span><span class="p">():</span>
+            <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;- </span><span class="si">{}</span><span class="s1">: vis=</span><span class="si">{}</span><span class="s1"> par=</span><span class="si">{}</span><span class="s1"> win=</span><span class="si">{}</span><span class="s1">&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="n">w</span><span class="o">.</span><span class="n">get_visible</span><span class="p">(),</span> <span class="n">w</span><span class="o">.</span><span class="n">get_parent</span><span class="p">(),</span> <span class="n">w</span><span class="o">.</span><span class="n">get_window</span><span class="p">()))</span>
 
-<div class="viewcode-block" id="UI.switch_annotations"><a class="viewcode-back" href="../../pympress.html#pympress.ui.UI.switch_annotations">[docs]</a>    <span class="k">def</span> <span class="nf">switch_annotations</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">):</span>
+        <span class="k">return</span> <span class="kc">True</span></div>
+
+
+<div class="viewcode-block" id="UI.switch_annotations"><a class="viewcode-back" href="../../pympress.html#pympress.ui.UI.switch_annotations">[docs]</a>    <span class="k">def</span> <span class="nf">switch_annotations</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">widget</span><span class="p">,</span> <span class="n">event</span> <span class="o">=</span> <span class="kc">None</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot; Switch the display to show annotations or to hide them.</span>
+
+<span class="sd">        Returns:</span>
+<span class="sd">            `bool`: whether the mode has been toggled.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
+        <span class="k">if</span> <span class="nb">issubclass</span><span class="p">(</span><span class="nb">type</span><span class="p">(</span><span class="n">widget</span><span class="p">),</span> <span class="n">Gtk</span><span class="o">.</span><span class="n">CheckMenuItem</span><span class="p">)</span> <span class="ow">and</span> <span class="n">widget</span><span class="o">.</span><span class="n">get_active</span><span class="p">()</span> <span class="o">==</span> <span class="bp">self</span><span class="o">.</span><span class="n">show_annotations</span><span class="p">:</span>
+            <span class="k">return</span> <span class="kc">False</span>
+
         <span class="bp">self</span><span class="o">.</span><span class="n">show_annotations</span> <span class="o">=</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">show_annotations</span>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">p_frame_annot</span><span class="o">.</span><span class="n">set_visible</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">show_annotations</span><span class="p">)</span>
@@ -1362,7 +1411,10 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
                     <span class="n">size</span> <span class="o">=</span> <span class="n">parent</span><span class="o">.</span><span class="n">get_parent</span><span class="p">()</span><span class="o">.</span><span class="n">get_allocated_height</span><span class="p">()</span>
                 <span class="n">parent</span><span class="o">.</span><span class="n">set_position</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">pane_handle_pos</span><span class="p">[</span><span class="n">parent</span><span class="p">]</span> <span class="o">*</span> <span class="n">size</span><span class="p">)</span>
 
-        <span class="bp">self</span><span class="o">.</span><span class="n">on_page_change</span><span class="p">(</span><span class="kc">False</span><span class="p">)</span></div>
+        <span class="bp">self</span><span class="o">.</span><span class="n">on_page_change</span><span class="p">(</span><span class="kc">False</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">pres_annot</span><span class="o">.</span><span class="n">set_active</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">show_annotations</span><span class="p">)</span>
+
+        <span class="k">return</span> <span class="kc">True</span></div>
 
 
 <div class="viewcode-block" id="UI.switch_bigbuttons"><a class="viewcode-back" href="../../pympress.html#pympress.ui.UI.switch_bigbuttons">[docs]</a>    <span class="k">def</span> <span class="nf">switch_bigbuttons</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">):</span>
@@ -1419,7 +1471,7 @@ <h1>Source code for pympress.ui</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/util.html b/docs/_modules/pympress/util.html
index bf839767..74eff72c 100644
--- a/docs/_modules/pympress/util.html
+++ b/docs/_modules/pympress/util.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -189,6 +189,7 @@ <h1>Source code for pympress.util</h1><div class="highlight"><pre>
 
 <span class="kn">import</span> <span class="nn">gi</span>
 <span class="kn">import</span> <span class="nn">subprocess</span>
+<span class="kn">import</span> <span class="nn">importlib</span>
 <span class="n">gi</span><span class="o">.</span><span class="n">require_version</span><span class="p">(</span><span class="s1">&#39;Gtk&#39;</span><span class="p">,</span> <span class="s1">&#39;3.0&#39;</span><span class="p">)</span>
 <span class="kn">from</span> <span class="nn">gi.repository</span> <span class="k">import</span> <span class="n">Gtk</span><span class="p">,</span> <span class="n">Gdk</span><span class="p">,</span> <span class="n">GObject</span><span class="p">,</span> <span class="n">GdkPixbuf</span>
 <span class="kn">import</span> <span class="nn">pkg_resources</span>
@@ -220,6 +221,12 @@ <h1>Source code for pympress.util</h1><div class="highlight"><pre>
 
 
 
+<div class="viewcode-block" id="get_pympress_meta"><a class="viewcode-back" href="../../pympress.html#pympress.util.get_pympress_meta">[docs]</a><span class="k">def</span> <span class="nf">get_pympress_meta</span><span class="p">():</span>
+    <span class="sd">&quot;&quot;&quot; Get metadata (version, etc) from pympress&#39; __init__.py</span>
+<span class="sd">    &quot;&quot;&quot;</span>
+    <span class="k">return</span> <span class="n">importlib</span><span class="o">.</span><span class="n">import_module</span><span class="p">(</span><span class="s1">&#39;pympress.__init__&#39;</span><span class="p">)</span></div>
+
+
 <span class="k">def</span> <span class="nf">__get_resource_path</span><span class="p">(</span><span class="o">*</span><span class="n">path_parts</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot; Return the resource path based on whether its frozen or not.</span>
 <span class="sd">    Paths parts given should be relative to the pympress package dir.</span>
@@ -450,7 +457,7 @@ <h1>Source code for pympress.util</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/pympress/vlcvideo.html b/docs/_modules/pympress/vlcvideo.html
index 53a75007..538a859c 100644
--- a/docs/_modules/pympress/vlcvideo.html
+++ b/docs/_modules/pympress/vlcvideo.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -402,7 +402,7 @@ <h1>Source code for pympress.vlcvideo</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_modules/vlc.html b/docs/_modules/vlc.html
index 46235f26..80c60b26 100644
--- a/docs/_modules/vlc.html
+++ b/docs/_modules/vlc.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="../index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -158,10 +158,11 @@
             
   <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span></span><span class="ch">#! /usr/bin/python</span>
+<span class="c1"># -*- coding: utf-8 -*-</span>
 
 <span class="c1"># Python ctypes bindings for VLC</span>
 <span class="c1">#</span>
-<span class="c1"># Copyright (C) 2009-2012 the VideoLAN team</span>
+<span class="c1"># Copyright (C) 2009-2017 the VideoLAN team</span>
 <span class="c1"># $Id: $</span>
 <span class="c1">#</span>
 <span class="c1"># Authors: Olivier Aubert &lt;contact at olivieraubert.net&gt;</span>
@@ -186,7 +187,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">U{http://wiki.videolan.org/LibVLC}.</span>
 
 <span class="sd">You can find the documentation and a README file with some examples</span>
-<span class="sd">at U{http://www.advene.org/download/python-ctypes/}.</span>
+<span class="sd">at U{http://www.olivieraubert.net/vlc/python-ctypes/}.</span>
 
 <span class="sd">Basically, the most important class is L{Instance}, which is used</span>
 <span class="sd">to create a libvlc instance.  From this instance, you then create</span>
@@ -207,8 +208,13 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="c1"># Used by EventManager in override.py</span>
 <span class="kn">from</span> <span class="nn">inspect</span> <span class="k">import</span> <span class="n">getargspec</span>
 
-<span class="n">__version__</span> <span class="o">=</span> <span class="s2">&quot;N/A&quot;</span>
-<span class="n">build_date</span>  <span class="o">=</span> <span class="s2">&quot;Thu Nov  5 23:41:43 2015&quot;</span>
+<span class="kn">import</span> <span class="nn">logging</span>
+<span class="n">logger</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">getLogger</span><span class="p">(</span><span class="vm">__name__</span><span class="p">)</span>
+
+<span class="n">__version__</span> <span class="o">=</span> <span class="s2">&quot;2.2.6100&quot;</span>
+<span class="n">__libvlc_version__</span> <span class="o">=</span> <span class="s2">&quot;2.2.6&quot;</span>
+<span class="n">__generator_version__</span> <span class="o">=</span> <span class="s2">&quot;1.0&quot;</span>
+<span class="n">build_date</span>  <span class="o">=</span> <span class="s2">&quot;Tue Oct 10 18:56:50 2017 2.2.6&quot;</span>
 
 <span class="c1"># The libvlc doc states that filenames are expected to be in UTF8, do</span>
 <span class="c1"># not rely on sys.getfilesystemencoding() which will be confused,</span>
@@ -264,7 +270,19 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 
 <span class="k">def</span> <span class="nf">find_lib</span><span class="p">():</span>
     <span class="n">dll</span> <span class="o">=</span> <span class="kc">None</span>
-    <span class="n">plugin_path</span> <span class="o">=</span> <span class="kc">None</span>
+    <span class="n">plugin_path</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;PYTHON_VLC_MODULE_PATH&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span>
+    <span class="k">if</span> <span class="s1">&#39;PYTHON_VLC_LIB_PATH&#39;</span> <span class="ow">in</span> <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">:</span>
+        <span class="k">try</span><span class="p">:</span>
+            <span class="n">dll</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CDLL</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s1">&#39;PYTHON_VLC_LIB_PATH&#39;</span><span class="p">])</span>
+        <span class="k">except</span> <span class="ne">OSError</span><span class="p">:</span>
+            <span class="n">logger</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s2">&quot;Cannot load lib specified by PYTHON_VLC_LIB_PATH env. variable&quot;</span><span class="p">)</span>
+            <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
+    <span class="k">if</span> <span class="n">plugin_path</span> <span class="ow">and</span> <span class="ow">not</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">isdir</span><span class="p">(</span><span class="n">plugin_path</span><span class="p">):</span>
+        <span class="n">logger</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s2">&quot;Invalid PYTHON_VLC_MODULE_PATH specified. Please fix.&quot;</span><span class="p">)</span>
+        <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
+    <span class="k">if</span> <span class="n">dll</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
+        <span class="k">return</span> <span class="n">dll</span><span class="p">,</span> <span class="n">plugin_path</span>
+
     <span class="k">if</span> <span class="n">sys</span><span class="o">.</span><span class="n">platform</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s1">&#39;linux&#39;</span><span class="p">):</span>
         <span class="n">p</span> <span class="o">=</span> <span class="n">find_library</span><span class="p">(</span><span class="s1">&#39;vlc&#39;</span><span class="p">)</span>
         <span class="k">try</span><span class="p">:</span>
@@ -272,7 +290,8 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="k">except</span> <span class="ne">OSError</span><span class="p">:</span>  <span class="c1"># may fail</span>
             <span class="n">dll</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CDLL</span><span class="p">(</span><span class="s1">&#39;libvlc.so.5&#39;</span><span class="p">)</span>
     <span class="k">elif</span> <span class="n">sys</span><span class="o">.</span><span class="n">platform</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s1">&#39;win&#39;</span><span class="p">):</span>
-        <span class="n">p</span> <span class="o">=</span> <span class="n">find_library</span><span class="p">(</span><span class="s1">&#39;libvlc.dll&#39;</span><span class="p">)</span>
+        <span class="n">libname</span> <span class="o">=</span> <span class="s1">&#39;libvlc.dll&#39;</span>
+        <span class="n">p</span> <span class="o">=</span> <span class="n">find_library</span><span class="p">(</span><span class="n">libname</span><span class="p">)</span>
         <span class="k">if</span> <span class="n">p</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
             <span class="k">try</span><span class="p">:</span>  <span class="c1"># some registry settings</span>
                 <span class="c1"># leaner than win32api, win32con</span>
@@ -291,10 +310,14 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
             <span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>  <span class="c1"># no PyWin32</span>
                 <span class="k">pass</span>
             <span class="k">if</span> <span class="n">plugin_path</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
-                 <span class="c1"># try some standard locations.</span>
-                <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="p">(</span><span class="s1">&#39;Program Files</span><span class="se">\\</span><span class="s1">VideoLan</span><span class="se">\\</span><span class="s1">&#39;</span><span class="p">,</span> <span class="s1">&#39;VideoLan</span><span class="se">\\</span><span class="s1">&#39;</span><span class="p">,</span>
-                          <span class="s1">&#39;Program Files</span><span class="se">\\</span><span class="s1">&#39;</span><span class="p">,</span>           <span class="s1">&#39;&#39;</span><span class="p">):</span>
-                    <span class="n">p</span> <span class="o">=</span> <span class="s1">&#39;C:</span><span class="se">\\</span><span class="s1">&#39;</span> <span class="o">+</span> <span class="n">p</span> <span class="o">+</span> <span class="s1">&#39;VLC</span><span class="se">\\</span><span class="s1">libvlc.dll&#39;</span>
+                <span class="c1"># try some standard locations.</span>
+                <span class="n">programfiles</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s2">&quot;ProgramFiles&quot;</span><span class="p">]</span>
+                <span class="n">homedir</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s2">&quot;HOMEDRIVE&quot;</span><span class="p">]</span>
+                <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="p">(</span><span class="s1">&#39;</span><span class="si">{programfiles}</span><span class="se">\\</span><span class="s1">VideoLan</span><span class="si">{libname}</span><span class="s1">&#39;</span><span class="p">,</span> <span class="s1">&#39;</span><span class="si">{homedir}</span><span class="s1">:</span><span class="se">\\</span><span class="s1">VideoLan</span><span class="si">{libname}</span><span class="s1">&#39;</span><span class="p">,</span>
+                          <span class="s1">&#39;</span><span class="si">{programfiles}{libname}</span><span class="s1">&#39;</span><span class="p">,</span>           <span class="s1">&#39;</span><span class="si">{homedir}</span><span class="s1">:</span><span class="si">{libname}</span><span class="s1">&#39;</span><span class="p">):</span>
+                    <span class="n">p</span> <span class="o">=</span> <span class="n">p</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">homedir</span> <span class="o">=</span> <span class="n">homedir</span><span class="p">,</span>
+                                 <span class="n">programfiles</span> <span class="o">=</span> <span class="n">programfiles</span><span class="p">,</span>
+                                 <span class="n">libname</span> <span class="o">=</span> <span class="s1">&#39;</span><span class="se">\\</span><span class="s1">VLC</span><span class="se">\\</span><span class="s1">&#39;</span> <span class="o">+</span> <span class="n">libname</span><span class="p">)</span>
                     <span class="k">if</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">exists</span><span class="p">(</span><span class="n">p</span><span class="p">):</span>
                         <span class="n">plugin_path</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">dirname</span><span class="p">(</span><span class="n">p</span><span class="p">)</span>
                         <span class="k">break</span>
@@ -302,11 +325,11 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
                 <span class="n">p</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">getcwd</span><span class="p">()</span>
                 <span class="n">os</span><span class="o">.</span><span class="n">chdir</span><span class="p">(</span><span class="n">plugin_path</span><span class="p">)</span>
                  <span class="c1"># if chdir failed, this will raise an exception</span>
-                <span class="n">dll</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CDLL</span><span class="p">(</span><span class="s1">&#39;libvlc.dll&#39;</span><span class="p">)</span>
+                <span class="n">dll</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CDLL</span><span class="p">(</span><span class="n">libname</span><span class="p">)</span>
                  <span class="c1"># restore cwd after dll has been loaded</span>
                 <span class="n">os</span><span class="o">.</span><span class="n">chdir</span><span class="p">(</span><span class="n">p</span><span class="p">)</span>
             <span class="k">else</span><span class="p">:</span>  <span class="c1"># may fail</span>
-                <span class="n">dll</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CDLL</span><span class="p">(</span><span class="s1">&#39;libvlc.dll&#39;</span><span class="p">)</span>
+                <span class="n">dll</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CDLL</span><span class="p">(</span><span class="n">libname</span><span class="p">)</span>
         <span class="k">else</span><span class="p">:</span>
             <span class="n">plugin_path</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">dirname</span><span class="p">(</span><span class="n">p</span><span class="p">)</span>
             <span class="n">dll</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CDLL</span><span class="p">(</span><span class="n">p</span><span class="p">)</span>
@@ -317,9 +340,11 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="n">p</span> <span class="o">=</span> <span class="n">d</span> <span class="o">+</span> <span class="s1">&#39;lib/libvlc.dylib&#39;</span>
         <span class="k">if</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">exists</span><span class="p">(</span><span class="n">p</span><span class="p">):</span>
             <span class="n">dll</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CDLL</span><span class="p">(</span><span class="n">p</span><span class="p">)</span>
-            <span class="n">d</span> <span class="o">+=</span> <span class="s1">&#39;modules&#39;</span>
-            <span class="k">if</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">isdir</span><span class="p">(</span><span class="n">d</span><span class="p">):</span>
-                <span class="n">plugin_path</span> <span class="o">=</span> <span class="n">d</span>
+            <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="p">(</span><span class="s1">&#39;modules&#39;</span><span class="p">,</span> <span class="s1">&#39;plugins&#39;</span><span class="p">):</span>
+                <span class="n">p</span> <span class="o">=</span> <span class="n">d</span> <span class="o">+</span> <span class="n">p</span>
+                <span class="k">if</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">isdir</span><span class="p">(</span><span class="n">p</span><span class="p">):</span>
+                    <span class="n">plugin_path</span> <span class="o">=</span> <span class="n">p</span>
+                    <span class="k">break</span>
         <span class="k">else</span><span class="p">:</span>  <span class="c1"># hope, some PATH is set...</span>
             <span class="n">dll</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CDLL</span><span class="p">(</span><span class="s1">&#39;libvlc.dylib&#39;</span><span class="p">)</span>
 
@@ -452,6 +477,8 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
     <span class="k">def</span> <span class="nf">from_param</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">param</span><span class="p">):</span>
         <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">param</span><span class="p">,</span> <span class="n">_Seqs</span><span class="p">):</span>
             <span class="k">return</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">etype</span> <span class="o">*</span> <span class="nb">len</span><span class="p">(</span><span class="n">param</span><span class="p">))(</span><span class="o">*</span><span class="n">param</span><span class="p">)</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="k">return</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">param</span><span class="p">)</span>
 
 <span class="c1"># errcheck functions for some native functions.</span>
 <span class="k">def</span> <span class="nf">string_result</span><span class="p">(</span><span class="n">result</span><span class="p">,</span> <span class="n">func</span><span class="p">,</span> <span class="n">arguments</span><span class="p">):</span>
@@ -584,20 +611,15 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="mi">273</span><span class="p">:</span> <span class="s1">&#39;MediaPlayerLengthChanged&#39;</span><span class="p">,</span>
         <span class="mi">274</span><span class="p">:</span> <span class="s1">&#39;MediaPlayerVout&#39;</span><span class="p">,</span>
         <span class="mi">275</span><span class="p">:</span> <span class="s1">&#39;MediaPlayerScrambledChanged&#39;</span><span class="p">,</span>
-        <span class="mi">276</span><span class="p">:</span> <span class="s1">&#39;MediaPlayerESAdded&#39;</span><span class="p">,</span>
-        <span class="mi">277</span><span class="p">:</span> <span class="s1">&#39;MediaPlayerESDeleted&#39;</span><span class="p">,</span>
-        <span class="mi">278</span><span class="p">:</span> <span class="s1">&#39;MediaPlayerESSelected&#39;</span><span class="p">,</span>
         <span class="mi">279</span><span class="p">:</span> <span class="s1">&#39;MediaPlayerCorked&#39;</span><span class="p">,</span>
         <span class="mi">280</span><span class="p">:</span> <span class="s1">&#39;MediaPlayerUncorked&#39;</span><span class="p">,</span>
         <span class="mi">281</span><span class="p">:</span> <span class="s1">&#39;MediaPlayerMuted&#39;</span><span class="p">,</span>
         <span class="mi">282</span><span class="p">:</span> <span class="s1">&#39;MediaPlayerUnmuted&#39;</span><span class="p">,</span>
         <span class="mi">283</span><span class="p">:</span> <span class="s1">&#39;MediaPlayerAudioVolume&#39;</span><span class="p">,</span>
-        <span class="mi">284</span><span class="p">:</span> <span class="s1">&#39;MediaPlayerAudioDevice&#39;</span><span class="p">,</span>
         <span class="mh">0x200</span><span class="p">:</span> <span class="s1">&#39;MediaListItemAdded&#39;</span><span class="p">,</span>
         <span class="mi">513</span><span class="p">:</span> <span class="s1">&#39;MediaListWillAddItem&#39;</span><span class="p">,</span>
         <span class="mi">514</span><span class="p">:</span> <span class="s1">&#39;MediaListItemDeleted&#39;</span><span class="p">,</span>
         <span class="mi">515</span><span class="p">:</span> <span class="s1">&#39;MediaListWillDeleteItem&#39;</span><span class="p">,</span>
-        <span class="mi">516</span><span class="p">:</span> <span class="s1">&#39;MediaListEndReached&#39;</span><span class="p">,</span>
         <span class="mh">0x300</span><span class="p">:</span> <span class="s1">&#39;MediaListViewItemAdded&#39;</span><span class="p">,</span>
         <span class="mi">769</span><span class="p">:</span> <span class="s1">&#39;MediaListViewWillAddItem&#39;</span><span class="p">,</span>
         <span class="mi">770</span><span class="p">:</span> <span class="s1">&#39;MediaListViewItemDeleted&#39;</span><span class="p">,</span>
@@ -623,7 +645,6 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaDiscovererStarted</span>        <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mh">0x500</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaDurationChanged</span>          <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">2</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaFreed</span>                    <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">4</span><span class="p">)</span>
-<span class="n">EventType</span><span class="o">.</span><span class="n">MediaListEndReached</span>           <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">516</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaListItemAdded</span>            <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mh">0x200</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaListItemDeleted</span>          <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">514</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaListPlayerNextItemSet</span>    <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">1025</span><span class="p">)</span>
@@ -637,14 +658,10 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaListWillDeleteItem</span>       <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">515</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaMetaChanged</span>              <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaParsedChanged</span>            <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">3</span><span class="p">)</span>
-<span class="n">EventType</span><span class="o">.</span><span class="n">MediaPlayerAudioDevice</span>        <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">284</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaPlayerAudioVolume</span>        <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">283</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaPlayerBackward</span>           <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">264</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaPlayerBuffering</span>          <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">259</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaPlayerCorked</span>             <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">279</span><span class="p">)</span>
-<span class="n">EventType</span><span class="o">.</span><span class="n">MediaPlayerESAdded</span>            <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">276</span><span class="p">)</span>
-<span class="n">EventType</span><span class="o">.</span><span class="n">MediaPlayerESDeleted</span>          <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">277</span><span class="p">)</span>
-<span class="n">EventType</span><span class="o">.</span><span class="n">MediaPlayerESSelected</span>         <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">278</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaPlayerEncounteredError</span>   <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">266</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaPlayerEndReached</span>         <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">265</span><span class="p">)</span>
 <span class="n">EventType</span><span class="o">.</span><span class="n">MediaPlayerForward</span>            <span class="o">=</span> <span class="n">EventType</span><span class="p">(</span><span class="mi">263</span><span class="p">)</span>
@@ -708,19 +725,15 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="mi">20</span><span class="p">:</span> <span class="s1">&#39;Episode&#39;</span><span class="p">,</span>
         <span class="mi">21</span><span class="p">:</span> <span class="s1">&#39;ShowName&#39;</span><span class="p">,</span>
         <span class="mi">22</span><span class="p">:</span> <span class="s1">&#39;Actors&#39;</span><span class="p">,</span>
-        <span class="mi">23</span><span class="p">:</span> <span class="s1">&#39;AlbumArtist&#39;</span><span class="p">,</span>
-        <span class="mi">24</span><span class="p">:</span> <span class="s1">&#39;DiscNumber&#39;</span><span class="p">,</span>
     <span class="p">}</span>
 <span class="n">Meta</span><span class="o">.</span><span class="n">Actors</span>      <span class="o">=</span> <span class="n">Meta</span><span class="p">(</span><span class="mi">22</span><span class="p">)</span>
 <span class="n">Meta</span><span class="o">.</span><span class="n">Album</span>       <span class="o">=</span> <span class="n">Meta</span><span class="p">(</span><span class="mi">4</span><span class="p">)</span>
-<span class="n">Meta</span><span class="o">.</span><span class="n">AlbumArtist</span> <span class="o">=</span> <span class="n">Meta</span><span class="p">(</span><span class="mi">23</span><span class="p">)</span>
 <span class="n">Meta</span><span class="o">.</span><span class="n">Artist</span>      <span class="o">=</span> <span class="n">Meta</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
 <span class="n">Meta</span><span class="o">.</span><span class="n">ArtworkURL</span>  <span class="o">=</span> <span class="n">Meta</span><span class="p">(</span><span class="mi">15</span><span class="p">)</span>
 <span class="n">Meta</span><span class="o">.</span><span class="n">Copyright</span>   <span class="o">=</span> <span class="n">Meta</span><span class="p">(</span><span class="mi">3</span><span class="p">)</span>
 <span class="n">Meta</span><span class="o">.</span><span class="n">Date</span>        <span class="o">=</span> <span class="n">Meta</span><span class="p">(</span><span class="mi">8</span><span class="p">)</span>
 <span class="n">Meta</span><span class="o">.</span><span class="n">Description</span> <span class="o">=</span> <span class="n">Meta</span><span class="p">(</span><span class="mi">6</span><span class="p">)</span>
 <span class="n">Meta</span><span class="o">.</span><span class="n">Director</span>    <span class="o">=</span> <span class="n">Meta</span><span class="p">(</span><span class="mi">18</span><span class="p">)</span>
-<span class="n">Meta</span><span class="o">.</span><span class="n">DiscNumber</span>  <span class="o">=</span> <span class="n">Meta</span><span class="p">(</span><span class="mi">24</span><span class="p">)</span>
 <span class="n">Meta</span><span class="o">.</span><span class="n">EncodedBy</span>   <span class="o">=</span> <span class="n">Meta</span><span class="p">(</span><span class="mi">14</span><span class="p">)</span>
 <span class="n">Meta</span><span class="o">.</span><span class="n">Episode</span>     <span class="o">=</span> <span class="n">Meta</span><span class="p">(</span><span class="mi">20</span><span class="p">)</span>
 <span class="n">Meta</span><span class="o">.</span><span class="n">Genre</span>       <span class="o">=</span> <span class="n">Meta</span><span class="p">(</span><span class="mi">2</span><span class="p">)</span>
@@ -778,52 +791,6 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="n">TrackType</span><span class="o">.</span><span class="n">unknown</span> <span class="o">=</span> <span class="n">TrackType</span><span class="p">(</span><span class="o">-</span><span class="mi">1</span><span class="p">)</span>
 <span class="n">TrackType</span><span class="o">.</span><span class="n">video</span>   <span class="o">=</span> <span class="n">TrackType</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
 
-<span class="k">class</span> <span class="nc">MediaType</span><span class="p">(</span><span class="n">_Enum</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Media type</span>
-<span class="sd">See libvlc_media_get_type.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">_enum_names_</span> <span class="o">=</span> <span class="p">{</span>
-        <span class="mi">0</span><span class="p">:</span> <span class="s1">&#39;unknown&#39;</span><span class="p">,</span>
-        <span class="mi">1</span><span class="p">:</span> <span class="s1">&#39;file&#39;</span><span class="p">,</span>
-        <span class="mi">2</span><span class="p">:</span> <span class="s1">&#39;directory&#39;</span><span class="p">,</span>
-        <span class="mi">3</span><span class="p">:</span> <span class="s1">&#39;disc&#39;</span><span class="p">,</span>
-        <span class="mi">4</span><span class="p">:</span> <span class="s1">&#39;stream&#39;</span><span class="p">,</span>
-        <span class="mi">5</span><span class="p">:</span> <span class="s1">&#39;playlist&#39;</span><span class="p">,</span>
-    <span class="p">}</span>
-<span class="n">MediaType</span><span class="o">.</span><span class="n">directory</span> <span class="o">=</span> <span class="n">MediaType</span><span class="p">(</span><span class="mi">2</span><span class="p">)</span>
-<span class="n">MediaType</span><span class="o">.</span><span class="n">disc</span>      <span class="o">=</span> <span class="n">MediaType</span><span class="p">(</span><span class="mi">3</span><span class="p">)</span>
-<span class="n">MediaType</span><span class="o">.</span><span class="n">file</span>      <span class="o">=</span> <span class="n">MediaType</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
-<span class="n">MediaType</span><span class="o">.</span><span class="n">playlist</span>  <span class="o">=</span> <span class="n">MediaType</span><span class="p">(</span><span class="mi">5</span><span class="p">)</span>
-<span class="n">MediaType</span><span class="o">.</span><span class="n">stream</span>    <span class="o">=</span> <span class="n">MediaType</span><span class="p">(</span><span class="mi">4</span><span class="p">)</span>
-<span class="n">MediaType</span><span class="o">.</span><span class="n">unknown</span>   <span class="o">=</span> <span class="n">MediaType</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span>
-
-<span class="k">class</span> <span class="nc">MediaParseFlag</span><span class="p">(</span><span class="n">_Enum</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Parse flags used by libvlc_media_parse_with_options()</span>
-<span class="sd">See libvlc_media_parse_with_options.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">_enum_names_</span> <span class="o">=</span> <span class="p">{</span>
-        <span class="mh">0x00</span><span class="p">:</span> <span class="s1">&#39;local&#39;</span><span class="p">,</span>
-        <span class="mh">0x01</span><span class="p">:</span> <span class="s1">&#39;network&#39;</span><span class="p">,</span>
-        <span class="mh">0x02</span><span class="p">:</span> <span class="s1">&#39;local&#39;</span><span class="p">,</span>
-        <span class="mh">0x04</span><span class="p">:</span> <span class="s1">&#39;network&#39;</span><span class="p">,</span>
-    <span class="p">}</span>
-<span class="n">MediaParseFlag</span><span class="o">.</span><span class="n">local</span>   <span class="o">=</span> <span class="n">MediaParseFlag</span><span class="p">(</span><span class="mh">0x00</span><span class="p">)</span>
-<span class="n">MediaParseFlag</span><span class="o">.</span><span class="n">local</span>   <span class="o">=</span> <span class="n">MediaParseFlag</span><span class="p">(</span><span class="mh">0x02</span><span class="p">)</span>
-<span class="n">MediaParseFlag</span><span class="o">.</span><span class="n">network</span> <span class="o">=</span> <span class="n">MediaParseFlag</span><span class="p">(</span><span class="mh">0x01</span><span class="p">)</span>
-<span class="n">MediaParseFlag</span><span class="o">.</span><span class="n">network</span> <span class="o">=</span> <span class="n">MediaParseFlag</span><span class="p">(</span><span class="mh">0x04</span><span class="p">)</span>
-
-<span class="k">class</span> <span class="nc">PlaybackMode</span><span class="p">(</span><span class="n">_Enum</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Defines playback modes for playlist.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">_enum_names_</span> <span class="o">=</span> <span class="p">{</span>
-        <span class="mi">0</span><span class="p">:</span> <span class="s1">&#39;default&#39;</span><span class="p">,</span>
-        <span class="mi">1</span><span class="p">:</span> <span class="s1">&#39;loop&#39;</span><span class="p">,</span>
-        <span class="mi">2</span><span class="p">:</span> <span class="s1">&#39;repeat&#39;</span><span class="p">,</span>
-    <span class="p">}</span>
-<span class="n">PlaybackMode</span><span class="o">.</span><span class="n">default</span> <span class="o">=</span> <span class="n">PlaybackMode</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span>
-<span class="n">PlaybackMode</span><span class="o">.</span><span class="n">loop</span>    <span class="o">=</span> <span class="n">PlaybackMode</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
-<span class="n">PlaybackMode</span><span class="o">.</span><span class="n">repeat</span>  <span class="o">=</span> <span class="n">PlaybackMode</span><span class="p">(</span><span class="mi">2</span><span class="p">)</span>
-
 <span class="k">class</span> <span class="nc">VideoMarqueeOption</span><span class="p">(</span><span class="n">_Enum</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Marq options definition.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
@@ -974,358 +941,246 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="n">AudioOutputChannel</span><span class="o">.</span><span class="n">Right</span>   <span class="o">=</span> <span class="n">AudioOutputChannel</span><span class="p">(</span><span class="mi">4</span><span class="p">)</span>
 <span class="n">AudioOutputChannel</span><span class="o">.</span><span class="n">Stereo</span>  <span class="o">=</span> <span class="n">AudioOutputChannel</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
 
+<span class="k">class</span> <span class="nc">PlaybackMode</span><span class="p">(</span><span class="n">_Enum</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Defines playback modes for playlist.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">_enum_names_</span> <span class="o">=</span> <span class="p">{</span>
+        <span class="mi">0</span><span class="p">:</span> <span class="s1">&#39;default&#39;</span><span class="p">,</span>
+        <span class="mi">1</span><span class="p">:</span> <span class="s1">&#39;loop&#39;</span><span class="p">,</span>
+        <span class="mi">2</span><span class="p">:</span> <span class="s1">&#39;repeat&#39;</span><span class="p">,</span>
+    <span class="p">}</span>
+<span class="n">PlaybackMode</span><span class="o">.</span><span class="n">default</span> <span class="o">=</span> <span class="n">PlaybackMode</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span>
+<span class="n">PlaybackMode</span><span class="o">.</span><span class="n">loop</span>    <span class="o">=</span> <span class="n">PlaybackMode</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
+<span class="n">PlaybackMode</span><span class="o">.</span><span class="n">repeat</span>  <span class="o">=</span> <span class="n">PlaybackMode</span><span class="p">(</span><span class="mi">2</span><span class="p">)</span>
+
 <span class="k">class</span> <span class="nc">Callback</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
-    <span class="sd">&quot;&quot;&quot;Callback function notification</span>
-<span class="sd">\param p_event the event triggering the callback</span>
+    <span class="sd">&quot;&quot;&quot;Callback function notification.</span>
+<span class="sd">    @param p_event: the event triggering the callback.</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">LogCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype for LibVLC log message handler.</span>
-<span class="sd">\param data data pointer as given to L{libvlc_log_set}()</span>
-<span class="sd">\param level message level (@ref libvlc_log_level)</span>
-<span class="sd">\param ctx message context (meta-information about the message)</span>
-<span class="sd">\param fmt printf() format string (as defined by ISO C11)</span>
-<span class="sd">\param args variable argument list for the format</span>
-<span class="sd">\note Log message handlers &lt;b&gt;must&lt;/b&gt; be thread-safe.</span>
-<span class="sd">\warning The message context pointer, the format string parameters and the</span>
-<span class="sd">         variable arguments are only valid until the callback returns.</span>
-<span class="sd">    &quot;&quot;&quot;</span>
-    <span class="k">pass</span>
-<span class="k">class</span> <span class="nc">MediaOpenCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
-    <span class="sd">&quot;&quot;&quot;Callback prototype to open a custom bitstream input media.</span>
-<span class="sd">The same media item can be opened multiple times. Each time, this callback</span>
-<span class="sd">is invoked. It should allocate and initialize any instance-specific</span>
-<span class="sd">resources, then store them in *datap. The instance resources can be freed</span>
-<span class="sd">in the @ref libvlc_media_close_cb callback.</span>
-<span class="sd">\param opaque private pointer as passed to L{libvlc_media_new_callbacks}()</span>
-<span class="sd">\param datap storage space for a private data pointer [OUT]</span>
-<span class="sd">\param sizep byte length of the bitstream or UINT64_MAX if unknown [OUT]</span>
-<span class="sd">\note For convenience, *datap is initially NULL and *sizep is initially 0.</span>
-<span class="sd">\return 0 on success, non-zero on error. In case of failure, the other</span>
-<span class="sd">callbacks will not be invoked and any value stored in *datap and *sizep is</span>
-<span class="sd">discarded.</span>
-<span class="sd">    &quot;&quot;&quot;</span>
-    <span class="k">pass</span>
-<span class="k">class</span> <span class="nc">MediaReadCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
-    <span class="sd">&quot;&quot;&quot;Callback prototype to read data from a custom bitstream input media.</span>
-<span class="sd">\param opaque private pointer as set by the @ref libvlc_media_open_cb</span>
-<span class="sd">              callback</span>
-<span class="sd">\param buf start address of the buffer to read data into</span>
-<span class="sd">\param len bytes length of the buffer</span>
-<span class="sd">\return strictly positive number of bytes read, 0 on end-of-stream,</span>
-<span class="sd">        or -1 on non-recoverable error</span>
-<span class="sd">\note If no data is immediately available, then the callback should sleep.</span>
-<span class="sd">\warning The application is responsible for avoiding deadlock situations.</span>
-<span class="sd">In particular, the callback should return an error if playback is stopped;</span>
-<span class="sd">if it does not return, then L{libvlc_media_player_stop}() will never return.</span>
-<span class="sd">    &quot;&quot;&quot;</span>
-    <span class="k">pass</span>
-<span class="k">class</span> <span class="nc">MediaSeekCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
-    <span class="sd">&quot;&quot;&quot;Callback prototype to seek a custom bitstream input media.</span>
-<span class="sd">\param opaque private pointer as set by the @ref libvlc_media_open_cb</span>
-<span class="sd">              callback</span>
-<span class="sd">\param offset absolute byte offset to seek to</span>
-<span class="sd">\return 0 on success, -1 on error.</span>
-<span class="sd">    &quot;&quot;&quot;</span>
-    <span class="k">pass</span>
-<span class="k">class</span> <span class="nc">MediaCloseCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
-    <span class="sd">&quot;&quot;&quot;Callback prototype to close a custom bitstream input media.</span>
-<span class="sd">\param opaque private pointer as set by the @ref libvlc_media_open_cb</span>
-<span class="sd">              callback</span>
+<span class="sd">    @param data: data pointer as given to L{libvlc_log_set}().</span>
+<span class="sd">    @param level: message level (@ref enum libvlc_log_level).</span>
+<span class="sd">    @param ctx: message context (meta-information about the message).</span>
+<span class="sd">    @param fmt: printf() format string (as defined by ISO C11).</span>
+<span class="sd">    @param args: variable argument list for the format @note Log message handlers B{must} be thread-safe. @warning The message context pointer, the format string parameters and the variable arguments are only valid until the callback returns.</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">VideoLockCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype to allocate and lock a picture buffer.</span>
-<span class="sd">Whenever a new video frame needs to be decoded, the lock callback is</span>
-<span class="sd">invoked. Depending on the video chroma, one or three pixel planes of</span>
-<span class="sd">adequate dimensions must be returned via the second parameter. Those</span>
-<span class="sd">planes must be aligned on 32-bytes boundaries.</span>
-<span class="sd">\param opaque private pointer as passed to L{libvlc_video_set_callbacks}() [IN]</span>
-<span class="sd">\param planes start address of the pixel planes (LibVLC allocates the array</span>
-<span class="sd">            of void pointers, this callback must initialize the array) [OUT]</span>
-<span class="sd">\return a private pointer for the display and unlock callbacks to identify</span>
-<span class="sd">        the picture buffers</span>
+<span class="sd">    Whenever a new video frame needs to be decoded, the lock callback is</span>
+<span class="sd">    invoked. Depending on the video chroma, one or three pixel planes of</span>
+<span class="sd">    adequate dimensions must be returned via the second parameter. Those</span>
+<span class="sd">    planes must be aligned on 32-bytes boundaries.</span>
+<span class="sd">    @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN].</span>
+<span class="sd">    @param planes: start address of the pixel planes (LibVLC allocates the array of void pointers, this callback must initialize the array) [OUT].</span>
+<span class="sd">    @return: a private pointer for the display and unlock callbacks to identify the picture buffers.</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">VideoUnlockCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype to unlock a picture buffer.</span>
-<span class="sd">When the video frame decoding is complete, the unlock callback is invoked.</span>
-<span class="sd">This callback might not be needed at all. It is only an indication that the</span>
-<span class="sd">application can now read the pixel values if it needs to.</span>
-<span class="sd">\warning A picture buffer is unlocked after the picture is decoded,</span>
-<span class="sd">but before the picture is displayed.</span>
-<span class="sd">\param opaque private pointer as passed to L{libvlc_video_set_callbacks}() [IN]</span>
-<span class="sd">\param picture private pointer returned from the @ref libvlc_video_lock_cb</span>
-<span class="sd">               callback [IN]</span>
-<span class="sd">\param planes pixel planes as defined by the @ref libvlc_video_lock_cb</span>
-<span class="sd">              callback (this parameter is only for convenience) [IN]</span>
+<span class="sd">    When the video frame decoding is complete, the unlock callback is invoked.</span>
+<span class="sd">    This callback might not be needed at all. It is only an indication that the</span>
+<span class="sd">    application can now read the pixel values if it needs to.</span>
+<span class="sd">    @warning: A picture buffer is unlocked after the picture is decoded,</span>
+<span class="sd">    but before the picture is displayed.</span>
+<span class="sd">    @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN].</span>
+<span class="sd">    @param picture: private pointer returned from the @ref libvlc_video_lock_cb callback [IN].</span>
+<span class="sd">    @param planes: pixel planes as defined by the @ref libvlc_video_lock_cb callback (this parameter is only for convenience) [IN].</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">VideoDisplayCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype to display a picture.</span>
-<span class="sd">When the video frame needs to be shown, as determined by the media playback</span>
-<span class="sd">clock, the display callback is invoked.</span>
-<span class="sd">\param opaque private pointer as passed to L{libvlc_video_set_callbacks}() [IN]</span>
-<span class="sd">\param picture private pointer returned from the @ref libvlc_video_lock_cb</span>
-<span class="sd">               callback [IN]</span>
+<span class="sd">    When the video frame needs to be shown, as determined by the media playback</span>
+<span class="sd">    clock, the display callback is invoked.</span>
+<span class="sd">    @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() [IN].</span>
+<span class="sd">    @param picture: private pointer returned from the @ref libvlc_video_lock_cb callback [IN].</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">VideoFormatCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype to configure picture buffers format.</span>
-<span class="sd">This callback gets the format of the video as output by the video decoder</span>
-<span class="sd">and the chain of video filters (if any). It can opt to change any parameter</span>
-<span class="sd">as it needs. In that case, LibVLC will attempt to convert the video format</span>
-<span class="sd">(rescaling and chroma conversion) but these operations can be CPU intensive.</span>
-<span class="sd">\param opaque pointer to the private pointer passed to</span>
-<span class="sd">              L{libvlc_video_set_callbacks}() [IN/OUT]</span>
-<span class="sd">\param chroma pointer to the 4 bytes video format identifier [IN/OUT]</span>
-<span class="sd">\param width pointer to the pixel width [IN/OUT]</span>
-<span class="sd">\param height pointer to the pixel height [IN/OUT]</span>
-<span class="sd">\param pitches table of scanline pitches in bytes for each pixel plane</span>
-<span class="sd">               (the table is allocated by LibVLC) [OUT]</span>
-<span class="sd">\param lines table of scanlines count for each plane [OUT]</span>
-<span class="sd">\return the number of picture buffers allocated, 0 indicates failure</span>
-<span class="sd">\note</span>
-<span class="sd">For each pixels plane, the scanline pitch must be bigger than or equal to</span>
-<span class="sd">the number of bytes per pixel multiplied by the pixel width.</span>
-<span class="sd">Similarly, the number of scanlines must be bigger than of equal to</span>
-<span class="sd">the pixel height.</span>
-<span class="sd">Furthermore, we recommend that pitches and lines be multiple of 32</span>
-<span class="sd">to not break assumptions that might be held by optimized code</span>
-<span class="sd">in the video decoders, video filters and/or video converters.</span>
+<span class="sd">    This callback gets the format of the video as output by the video decoder</span>
+<span class="sd">    and the chain of video filters (if any). It can opt to change any parameter</span>
+<span class="sd">    as it needs. In that case, LibVLC will attempt to convert the video format</span>
+<span class="sd">    (rescaling and chroma conversion) but these operations can be CPU intensive.</span>
+<span class="sd">    @param opaque: pointer to the private pointer passed to L{libvlc_video_set_callbacks}() [IN/OUT].</span>
+<span class="sd">    @param chroma: pointer to the 4 bytes video format identifier [IN/OUT].</span>
+<span class="sd">    @param width: pointer to the pixel width [IN/OUT].</span>
+<span class="sd">    @param height: pointer to the pixel height [IN/OUT].</span>
+<span class="sd">    @param pitches: table of scanline pitches in bytes for each pixel plane (the table is allocated by LibVLC) [OUT].</span>
+<span class="sd">    @return: lines table of scanlines count for each plane.</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">VideoCleanupCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype to configure picture buffers format.</span>
-<span class="sd">\param opaque private pointer as passed to L{libvlc_video_set_callbacks}()</span>
-<span class="sd">              (and possibly modified by @ref libvlc_video_format_cb) [IN]</span>
+<span class="sd">    @param opaque: private pointer as passed to L{libvlc_video_set_callbacks}() (and possibly modified by @ref libvlc_video_format_cb) [IN].</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">AudioPlayCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype for audio playback.</span>
-<span class="sd">\param data data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]</span>
-<span class="sd">\param samples pointer to the first audio sample to play back [IN]</span>
-<span class="sd">\param count number of audio samples to play back</span>
-<span class="sd">\param pts expected play time stamp (see libvlc_delay())</span>
+<span class="sd">    @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN].</span>
+<span class="sd">    @param samples: pointer to the first audio sample to play back [IN].</span>
+<span class="sd">    @param count: number of audio samples to play back.</span>
+<span class="sd">    @param pts: expected play time stamp (see libvlc_delay()).</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">AudioPauseCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype for audio pause.</span>
-<span class="sd">\note The pause callback is never called if the audio is already paused.</span>
-<span class="sd">\param data data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]</span>
-<span class="sd">\param pts time stamp of the pause request (should be elapsed already)</span>
+<span class="sd">    @note: The pause callback is never called if the audio is already paused.</span>
+<span class="sd">    @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN].</span>
+<span class="sd">    @param pts: time stamp of the pause request (should be elapsed already).</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">AudioResumeCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype for audio resumption (i.e. restart from pause).</span>
-<span class="sd">\note The resume callback is never called if the audio is not paused.</span>
-<span class="sd">\param data data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]</span>
-<span class="sd">\param pts time stamp of the resumption request (should be elapsed already)</span>
+<span class="sd">    @note: The resume callback is never called if the audio is not paused.</span>
+<span class="sd">    @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN].</span>
+<span class="sd">    @param pts: time stamp of the resumption request (should be elapsed already).</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">AudioFlushCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype for audio buffer flush</span>
-<span class="sd">(i.e. discard all pending buffers and stop playback as soon as possible).</span>
-<span class="sd">\param data data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]</span>
+<span class="sd">    (i.e. discard all pending buffers and stop playback as soon as possible).</span>
+<span class="sd">    @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN].</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">AudioDrainCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype for audio buffer drain</span>
-<span class="sd">(i.e. wait for pending buffers to be played).</span>
-<span class="sd">\param data data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]</span>
+<span class="sd">    (i.e. wait for pending buffers to be played).</span>
+<span class="sd">    @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN].</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">AudioSetVolumeCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype for audio volume change.</span>
-<span class="sd">\param data data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]</span>
-<span class="sd">\param volume software volume (1. = nominal, 0. = mute)</span>
-<span class="sd">\param mute muted flag</span>
+<span class="sd">    @param data: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN].</span>
+<span class="sd">    @param volume: software volume (1. = nominal, 0. = mute).</span>
+<span class="sd">    @param mute: muted flag.</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">AudioSetupCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype to setup the audio playback.</span>
-<span class="sd">This is called when the media player needs to create a new audio output.</span>
-<span class="sd">\param opaque pointer to the data pointer passed to</span>
-<span class="sd">              L{libvlc_audio_set_callbacks}() [IN/OUT]</span>
-<span class="sd">\param format 4 bytes sample format [IN/OUT]</span>
-<span class="sd">\param rate sample rate [IN/OUT]</span>
-<span class="sd">\param channels channels count [IN/OUT]</span>
-<span class="sd">\return 0 on success, anything else to skip audio playback</span>
+<span class="sd">    This is called when the media player needs to create a new audio output.</span>
+<span class="sd">    @param opaque: pointer to the data pointer passed to L{libvlc_audio_set_callbacks}() [IN/OUT].</span>
+<span class="sd">    @param format: 4 bytes sample format [IN/OUT].</span>
+<span class="sd">    @param rate: sample rate [IN/OUT].</span>
+<span class="sd">    @param channels: channels count [IN/OUT].</span>
+<span class="sd">    @return: 0 on success, anything else to skip audio playback.</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">AudioCleanupCb</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Callback prototype for audio playback cleanup.</span>
-<span class="sd">This is called when the media player no longer needs an audio output.</span>
-<span class="sd">\param opaque data pointer as passed to L{libvlc_audio_set_callbacks}() [IN]</span>
+<span class="sd">    This is called when the media player no longer needs an audio output.</span>
+<span class="sd">    @param opaque: data pointer as passed to L{libvlc_audio_set_callbacks}() [IN].</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">pass</span>
 <span class="k">class</span> <span class="nc">CallbackDecorators</span><span class="p">(</span><span class="nb">object</span><span class="p">):</span>
     <span class="s2">&quot;Class holding various method decorators for callback functions.&quot;</span>
     <span class="n">Callback</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">)</span>
-    <span class="n">Callback</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback function notification</span>
-<span class="s1">\param p_event the event triggering the callback</span>
+    <span class="n">Callback</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback function notification.</span>
+<span class="s1">        @param p_event: the event triggering the callback.</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
     <span class="n">LogCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Log_ptr</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">)</span>
     <span class="n">LogCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype for LibVLC log message handler.</span>
-<span class="s1">\param data data pointer as given to L</span><span class="si">{libvlc_log_set}</span><span class="s1">()</span>
-<span class="s1">\param level message level (@ref libvlc_log_level)</span>
-<span class="s1">\param ctx message context (meta-information about the message)</span>
-<span class="s1">\param fmt printf() format string (as defined by ISO C11)</span>
-<span class="s1">\param args variable argument list for the format</span>
-<span class="se">\n</span><span class="s1">ote Log message handlers &lt;b&gt;must&lt;/b&gt; be thread-safe.</span>
-<span class="s1">\warning The message context pointer, the format string parameters and the</span>
-<span class="s1">         variable arguments are only valid until the callback returns.</span>
-<span class="s1">    &#39;&#39;&#39;</span> 
-    <span class="n">MediaOpenCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ListPOINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint64</span><span class="p">))</span>
-    <span class="n">MediaOpenCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype to open a custom bitstream input media.</span>
-<span class="s1">The same media item can be opened multiple times. Each time, this callback</span>
-<span class="s1">is invoked. It should allocate and initialize any instance-specific</span>
-<span class="s1">resources, then store them in *datap. The instance resources can be freed</span>
-<span class="s1">in the @ref libvlc_media_close_cb callback.</span>
-<span class="s1">\param opaque private pointer as passed to L</span><span class="si">{libvlc_media_new_callbacks}</span><span class="s1">()</span>
-<span class="s1">\param datap storage space for a private data pointer [OUT]</span>
-<span class="s1">\param sizep byte length of the bitstream or UINT64_MAX if unknown [OUT]</span>
-<span class="se">\n</span><span class="s1">ote For convenience, *datap is initially NULL and *sizep is initially 0.</span>
-<span class="se">\r</span><span class="s1">eturn 0 on success, non-zero on error. In case of failure, the other</span>
-<span class="s1">callbacks will not be invoked and any value stored in *datap and *sizep is</span>
-<span class="s1">discarded.</span>
-<span class="s1">    &#39;&#39;&#39;</span> 
-    <span class="n">MediaReadCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_ssize_t</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_size_t</span><span class="p">)</span>
-    <span class="n">MediaReadCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype to read data from a custom bitstream input media.</span>
-<span class="s1">\param opaque private pointer as set by the @ref libvlc_media_open_cb</span>
-<span class="s1">              callback</span>
-<span class="s1">\param buf start address of the buffer to read data into</span>
-<span class="s1">\param len bytes length of the buffer</span>
-<span class="se">\r</span><span class="s1">eturn strictly positive number of bytes read, 0 on end-of-stream,</span>
-<span class="s1">        or -1 on non-recoverable error</span>
-<span class="se">\n</span><span class="s1">ote If no data is immediately available, then the callback should sleep.</span>
-<span class="s1">\warning The application is responsible for avoiding deadlock situations.</span>
-<span class="s1">In particular, the callback should return an error if playback is stopped;</span>
-<span class="s1">if it does not return, then L</span><span class="si">{libvlc_media_player_stop}</span><span class="s1">() will never return.</span>
+<span class="s1">        @param data: data pointer as given to L</span><span class="si">{libvlc_log_set}</span><span class="s1">().</span>
+<span class="s1">        @param level: message level (@ref enum libvlc_log_level).</span>
+<span class="s1">        @param ctx: message context (meta-information about the message).</span>
+<span class="s1">        @param fmt: printf() format string (as defined by ISO C11).</span>
+<span class="s1">        @param args: variable argument list for the format @note Log message handlers B</span><span class="si">{must}</span><span class="s1"> be thread-safe. @warning The message context pointer, the format string parameters and the variable arguments are only valid until the callback returns.</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
-    <span class="n">MediaSeekCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint64</span><span class="p">)</span>
-    <span class="n">MediaSeekCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype to seek a custom bitstream input media.</span>
-<span class="s1">\param opaque private pointer as set by the @ref libvlc_media_open_cb</span>
-<span class="s1">              callback</span>
-<span class="s1">\param offset absolute byte offset to seek to</span>
-<span class="se">\r</span><span class="s1">eturn 0 on success, -1 on error.</span>
-<span class="s1">    &#39;&#39;&#39;</span> 
-    <span class="n">MediaCloseCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">)</span>
-    <span class="n">MediaCloseCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype to close a custom bitstream input media.</span>
-<span class="s1">\param opaque private pointer as set by the @ref libvlc_media_open_cb</span>
-<span class="s1">              callback</span>
-<span class="s1">    &#39;&#39;&#39;</span> 
-    <span class="n">VideoLockCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ListPOINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">))</span>
+    <span class="n">VideoLockCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">))</span>
     <span class="n">VideoLockCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype to allocate and lock a picture buffer.</span>
-<span class="s1">Whenever a new video frame needs to be decoded, the lock callback is</span>
-<span class="s1">invoked. Depending on the video chroma, one or three pixel planes of</span>
-<span class="s1">adequate dimensions must be returned via the second parameter. Those</span>
-<span class="s1">planes must be aligned on 32-bytes boundaries.</span>
-<span class="s1">\param opaque private pointer as passed to L</span><span class="si">{libvlc_video_set_callbacks}</span><span class="s1">() [IN]</span>
-<span class="s1">\param planes start address of the pixel planes (LibVLC allocates the array</span>
-<span class="s1">            of void pointers, this callback must initialize the array) [OUT]</span>
-<span class="se">\r</span><span class="s1">eturn a private pointer for the display and unlock callbacks to identify</span>
-<span class="s1">        the picture buffers</span>
+<span class="s1">        Whenever a new video frame needs to be decoded, the lock callback is</span>
+<span class="s1">        invoked. Depending on the video chroma, one or three pixel planes of</span>
+<span class="s1">        adequate dimensions must be returned via the second parameter. Those</span>
+<span class="s1">        planes must be aligned on 32-bytes boundaries.</span>
+<span class="s1">        @param opaque: private pointer as passed to L</span><span class="si">{libvlc_video_set_callbacks}</span><span class="s1">() [IN].</span>
+<span class="s1">        @param planes: start address of the pixel planes (LibVLC allocates the array of void pointers, this callback must initialize the array) [OUT].</span>
+<span class="s1">        @return: a private pointer for the display and unlock callbacks to identify the picture buffers.</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
-    <span class="n">VideoUnlockCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ListPOINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">))</span>
+    <span class="n">VideoUnlockCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">))</span>
     <span class="n">VideoUnlockCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype to unlock a picture buffer.</span>
-<span class="s1">When the video frame decoding is complete, the unlock callback is invoked.</span>
-<span class="s1">This callback might not be needed at all. It is only an indication that the</span>
-<span class="s1">application can now read the pixel values if it needs to.</span>
-<span class="s1">\warning A picture buffer is unlocked after the picture is decoded,</span>
-<span class="s1">but before the picture is displayed.</span>
-<span class="s1">\param opaque private pointer as passed to L</span><span class="si">{libvlc_video_set_callbacks}</span><span class="s1">() [IN]</span>
-<span class="s1">\param picture private pointer returned from the @ref libvlc_video_lock_cb</span>
-<span class="s1">               callback [IN]</span>
-<span class="s1">\param planes pixel planes as defined by the @ref libvlc_video_lock_cb</span>
-<span class="s1">              callback (this parameter is only for convenience) [IN]</span>
+<span class="s1">        When the video frame decoding is complete, the unlock callback is invoked.</span>
+<span class="s1">        This callback might not be needed at all. It is only an indication that the</span>
+<span class="s1">        application can now read the pixel values if it needs to.</span>
+<span class="s1">        @warning: A picture buffer is unlocked after the picture is decoded,</span>
+<span class="s1">        but before the picture is displayed.</span>
+<span class="s1">        @param opaque: private pointer as passed to L</span><span class="si">{libvlc_video_set_callbacks}</span><span class="s1">() [IN].</span>
+<span class="s1">        @param picture: private pointer returned from the @ref libvlc_video_lock_cb callback [IN].</span>
+<span class="s1">        @param planes: pixel planes as defined by the @ref libvlc_video_lock_cb callback (this parameter is only for convenience) [IN].</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
     <span class="n">VideoDisplayCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">)</span>
     <span class="n">VideoDisplayCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype to display a picture.</span>
-<span class="s1">When the video frame needs to be shown, as determined by the media playback</span>
-<span class="s1">clock, the display callback is invoked.</span>
-<span class="s1">\param opaque private pointer as passed to L</span><span class="si">{libvlc_video_set_callbacks}</span><span class="s1">() [IN]</span>
-<span class="s1">\param picture private pointer returned from the @ref libvlc_video_lock_cb</span>
-<span class="s1">               callback [IN]</span>
+<span class="s1">        When the video frame needs to be shown, as determined by the media playback</span>
+<span class="s1">        clock, the display callback is invoked.</span>
+<span class="s1">        @param opaque: private pointer as passed to L</span><span class="si">{libvlc_video_set_callbacks}</span><span class="s1">() [IN].</span>
+<span class="s1">        @param picture: private pointer returned from the @ref libvlc_video_lock_cb callback [IN].</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
-    <span class="n">VideoFormatCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">),</span> <span class="n">ListPOINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">))</span>
+    <span class="n">VideoFormatCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">))</span>
     <span class="n">VideoFormatCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype to configure picture buffers format.</span>
-<span class="s1">This callback gets the format of the video as output by the video decoder</span>
-<span class="s1">and the chain of video filters (if any). It can opt to change any parameter</span>
-<span class="s1">as it needs. In that case, LibVLC will attempt to convert the video format</span>
-<span class="s1">(rescaling and chroma conversion) but these operations can be CPU intensive.</span>
-<span class="s1">\param opaque pointer to the private pointer passed to</span>
-<span class="s1">              L</span><span class="si">{libvlc_video_set_callbacks}</span><span class="s1">() [IN/OUT]</span>
-<span class="s1">\param chroma pointer to the 4 bytes video format identifier [IN/OUT]</span>
-<span class="s1">\param width pointer to the pixel width [IN/OUT]</span>
-<span class="s1">\param height pointer to the pixel height [IN/OUT]</span>
-<span class="s1">\param pitches table of scanline pitches in bytes for each pixel plane</span>
-<span class="s1">               (the table is allocated by LibVLC) [OUT]</span>
-<span class="s1">\param lines table of scanlines count for each plane [OUT]</span>
-<span class="se">\r</span><span class="s1">eturn the number of picture buffers allocated, 0 indicates failure</span>
-<span class="se">\n</span><span class="s1">ote</span>
-<span class="s1">For each pixels plane, the scanline pitch must be bigger than or equal to</span>
-<span class="s1">the number of bytes per pixel multiplied by the pixel width.</span>
-<span class="s1">Similarly, the number of scanlines must be bigger than of equal to</span>
-<span class="s1">the pixel height.</span>
-<span class="s1">Furthermore, we recommend that pitches and lines be multiple of 32</span>
-<span class="s1">to not break assumptions that might be held by optimized code</span>
-<span class="s1">in the video decoders, video filters and/or video converters.</span>
+<span class="s1">        This callback gets the format of the video as output by the video decoder</span>
+<span class="s1">        and the chain of video filters (if any). It can opt to change any parameter</span>
+<span class="s1">        as it needs. In that case, LibVLC will attempt to convert the video format</span>
+<span class="s1">        (rescaling and chroma conversion) but these operations can be CPU intensive.</span>
+<span class="s1">        @param opaque: pointer to the private pointer passed to L</span><span class="si">{libvlc_video_set_callbacks}</span><span class="s1">() [IN/OUT].</span>
+<span class="s1">        @param chroma: pointer to the 4 bytes video format identifier [IN/OUT].</span>
+<span class="s1">        @param width: pointer to the pixel width [IN/OUT].</span>
+<span class="s1">        @param height: pointer to the pixel height [IN/OUT].</span>
+<span class="s1">        @param pitches: table of scanline pitches in bytes for each pixel plane (the table is allocated by LibVLC) [OUT].</span>
+<span class="s1">        @return: lines table of scanlines count for each plane.</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
     <span class="n">VideoCleanupCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">)</span>
     <span class="n">VideoCleanupCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype to configure picture buffers format.</span>
-<span class="s1">\param opaque private pointer as passed to L</span><span class="si">{libvlc_video_set_callbacks}</span><span class="s1">()</span>
-<span class="s1">              (and possibly modified by @ref libvlc_video_format_cb) [IN]</span>
+<span class="s1">        @param opaque: private pointer as passed to L</span><span class="si">{libvlc_video_set_callbacks}</span><span class="s1">() (and possibly modified by @ref libvlc_video_format_cb) [IN].</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
     <span class="n">AudioPlayCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int64</span><span class="p">)</span>
     <span class="n">AudioPlayCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype for audio playback.</span>
-<span class="s1">\param data data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN]</span>
-<span class="s1">\param samples pointer to the first audio sample to play back [IN]</span>
-<span class="s1">\param count number of audio samples to play back</span>
-<span class="s1">\param pts expected play time stamp (see libvlc_delay())</span>
+<span class="s1">        @param data: data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN].</span>
+<span class="s1">        @param samples: pointer to the first audio sample to play back [IN].</span>
+<span class="s1">        @param count: number of audio samples to play back.</span>
+<span class="s1">        @param pts: expected play time stamp (see libvlc_delay()).</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
     <span class="n">AudioPauseCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int64</span><span class="p">)</span>
     <span class="n">AudioPauseCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype for audio pause.</span>
-<span class="se">\n</span><span class="s1">ote The pause callback is never called if the audio is already paused.</span>
-<span class="s1">\param data data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN]</span>
-<span class="s1">\param pts time stamp of the pause request (should be elapsed already)</span>
+<span class="s1">        @note: The pause callback is never called if the audio is already paused.</span>
+<span class="s1">        @param data: data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN].</span>
+<span class="s1">        @param pts: time stamp of the pause request (should be elapsed already).</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
     <span class="n">AudioResumeCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int64</span><span class="p">)</span>
     <span class="n">AudioResumeCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype for audio resumption (i.e. restart from pause).</span>
-<span class="se">\n</span><span class="s1">ote The resume callback is never called if the audio is not paused.</span>
-<span class="s1">\param data data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN]</span>
-<span class="s1">\param pts time stamp of the resumption request (should be elapsed already)</span>
+<span class="s1">        @note: The resume callback is never called if the audio is not paused.</span>
+<span class="s1">        @param data: data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN].</span>
+<span class="s1">        @param pts: time stamp of the resumption request (should be elapsed already).</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
     <span class="n">AudioFlushCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int64</span><span class="p">)</span>
     <span class="n">AudioFlushCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype for audio buffer flush</span>
-<span class="s1">(i.e. discard all pending buffers and stop playback as soon as possible).</span>
-<span class="s1">\param data data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN]</span>
+<span class="s1">        (i.e. discard all pending buffers and stop playback as soon as possible).</span>
+<span class="s1">        @param data: data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN].</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
     <span class="n">AudioDrainCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">)</span>
     <span class="n">AudioDrainCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype for audio buffer drain</span>
-<span class="s1">(i.e. wait for pending buffers to be played).</span>
-<span class="s1">\param data data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN]</span>
+<span class="s1">        (i.e. wait for pending buffers to be played).</span>
+<span class="s1">        @param data: data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN].</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
     <span class="n">AudioSetVolumeCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_float</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_bool</span><span class="p">)</span>
     <span class="n">AudioSetVolumeCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype for audio volume change.</span>
-<span class="s1">\param data data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN]</span>
-<span class="s1">\param volume software volume (1. = nominal, 0. = mute)</span>
-<span class="s1">\param mute muted flag</span>
+<span class="s1">        @param data: data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN].</span>
+<span class="s1">        @param volume: software volume (1. = nominal, 0. = mute).</span>
+<span class="s1">        @param mute: muted flag.</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
-    <span class="n">AudioSetupCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">),</span> <span class="n">ListPOINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">))</span>
+    <span class="n">AudioSetupCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">))</span>
     <span class="n">AudioSetupCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype to setup the audio playback.</span>
-<span class="s1">This is called when the media player needs to create a new audio output.</span>
-<span class="s1">\param opaque pointer to the data pointer passed to</span>
-<span class="s1">              L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN/OUT]</span>
-<span class="s1">\param format 4 bytes sample format [IN/OUT]</span>
-<span class="s1">\param rate sample rate [IN/OUT]</span>
-<span class="s1">\param channels channels count [IN/OUT]</span>
-<span class="se">\r</span><span class="s1">eturn 0 on success, anything else to skip audio playback</span>
+<span class="s1">        This is called when the media player needs to create a new audio output.</span>
+<span class="s1">        @param opaque: pointer to the data pointer passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN/OUT].</span>
+<span class="s1">        @param format: 4 bytes sample format [IN/OUT].</span>
+<span class="s1">        @param rate: sample rate [IN/OUT].</span>
+<span class="s1">        @param channels: channels count [IN/OUT].</span>
+<span class="s1">        @return: 0 on success, anything else to skip audio playback.</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
     <span class="n">AudioCleanupCb</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CFUNCTYPE</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">)</span>
     <span class="n">AudioCleanupCb</span><span class="o">.</span><span class="vm">__doc__</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39;Callback prototype for audio playback cleanup.</span>
-<span class="s1">This is called when the media player no longer needs an audio output.</span>
-<span class="s1">\param opaque data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN]</span>
+<span class="s1">        This is called when the media player no longer needs an audio output.</span>
+<span class="s1">        @param opaque: data pointer as passed to L</span><span class="si">{libvlc_audio_set_callbacks}</span><span class="s1">() [IN].</span>
 <span class="s1">    &#39;&#39;&#39;</span> 
 <span class="n">cb</span> <span class="o">=</span> <span class="n">CallbackDecorators</span>
  <span class="c1"># End of generated enum types #</span>
@@ -1590,8 +1445,31 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="p">(</span><span class="s1">&#39;name&#39;</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">),</span>
     <span class="p">]</span>
 
- <span class="c1"># End of header.py #</span>
+<span class="k">class</span> <span class="nc">VideoViewpoint</span><span class="p">(</span><span class="n">_Cstruct</span><span class="p">):</span>
+    <span class="n">_fields</span> <span class="o">=</span> <span class="p">[</span>
+        <span class="p">(</span><span class="s1">&#39;yaw&#39;</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_float</span><span class="p">),</span>
+        <span class="p">(</span><span class="s1">&#39;pitch&#39;</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_float</span><span class="p">),</span>
+        <span class="p">(</span><span class="s1">&#39;roll&#39;</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_float</span><span class="p">),</span>
+        <span class="p">(</span><span class="s1">&#39;field_of_view&#39;</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_float</span><span class="p">),</span>
+    <span class="p">]</span>
+
+<span class="c1"># This struct depends on the MediaSlaveType enum that is defined only</span>
+<span class="c1"># in &gt; 2.2</span>
+<span class="k">if</span> <span class="s1">&#39;MediaSlaveType&#39;</span> <span class="ow">in</span> <span class="nb">locals</span><span class="p">():</span>
+    <span class="k">class</span> <span class="nc">MediaSlave</span><span class="p">(</span><span class="n">_Cstruct</span><span class="p">):</span>
+        <span class="n">_fields</span> <span class="o">=</span> <span class="p">[</span>
+            <span class="p">(</span><span class="s1">&#39;psz_uri&#39;</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">),</span>
+            <span class="p">(</span><span class="s1">&#39;i_type&#39;</span><span class="p">,</span> <span class="n">MediaSlaveType</span><span class="p">),</span>
+            <span class="p">(</span><span class="s1">&#39;i_priority&#39;</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">)</span>
+        <span class="p">]</span>
+
+<span class="k">class</span> <span class="nc">RDDescription</span><span class="p">(</span><span class="n">_Cstruct</span><span class="p">):</span>
+    <span class="n">_fields</span> <span class="o">=</span> <span class="p">[</span>
+        <span class="p">(</span><span class="s1">&#39;name&#39;</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">),</span>
+        <span class="p">(</span><span class="s1">&#39;longname&#39;</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="p">]</span>
 
+<span class="c1"># End of header.py #</span>
 <span class="k">class</span> <span class="nc">EventManager</span><span class="p">(</span><span class="n">_Ctype</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Create an event manager with callback handler.</span>
 
@@ -1697,14 +1575,22 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
             <span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">i</span><span class="p">,</span> <span class="n">basestring</span><span class="p">):</span>
                 <span class="n">args</span> <span class="o">=</span> <span class="n">i</span><span class="o">.</span><span class="n">strip</span><span class="p">()</span><span class="o">.</span><span class="n">split</span><span class="p">()</span>
             <span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">i</span><span class="p">,</span> <span class="n">_Seqs</span><span class="p">):</span>
-                <span class="n">args</span> <span class="o">=</span> <span class="n">i</span>
+                <span class="n">args</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="n">i</span><span class="p">)</span>
             <span class="k">else</span><span class="p">:</span>
                 <span class="k">raise</span> <span class="n">VLCException</span><span class="p">(</span><span class="s1">&#39;Instance </span><span class="si">%r</span><span class="s1">&#39;</span> <span class="o">%</span> <span class="p">(</span><span class="n">args</span><span class="p">,))</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="n">args</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="n">args</span><span class="p">)</span>
+
+        <span class="k">if</span> <span class="ow">not</span> <span class="n">args</span><span class="p">:</span>  <span class="c1"># no parameters passed</span>
+            <span class="n">args</span> <span class="o">=</span> <span class="p">[</span><span class="s1">&#39;vlc&#39;</span><span class="p">]</span>
+        <span class="k">elif</span> <span class="n">args</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">!=</span> <span class="s1">&#39;vlc&#39;</span><span class="p">:</span>
+            <span class="n">args</span><span class="o">.</span><span class="n">insert</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="s1">&#39;vlc&#39;</span><span class="p">)</span>
+
+        <span class="k">if</span> <span class="n">plugin_path</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
+            <span class="c1"># set plugin_path if detected, win32 and MacOS,</span>
+            <span class="c1"># if the user did not specify it itself.</span>
+            <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="o">.</span><span class="n">setdefault</span><span class="p">(</span><span class="s1">&#39;VLC_PLUGIN_PATH&#39;</span><span class="p">,</span> <span class="n">plugin_path</span><span class="p">)</span>
 
-        <span class="k">if</span> <span class="ow">not</span> <span class="n">args</span> <span class="ow">and</span> <span class="n">plugin_path</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
-             <span class="c1"># no parameters passed, for win32 and MacOS,</span>
-             <span class="c1"># specify the plugin_path if detected earlier</span>
-            <span class="n">args</span> <span class="o">=</span> <span class="p">[</span><span class="s1">&#39;vlc&#39;</span><span class="p">,</span> <span class="s1">&#39;--plugin-path=&#39;</span> <span class="o">+</span> <span class="n">plugin_path</span><span class="p">]</span>
         <span class="k">if</span> <span class="n">PYTHON3</span><span class="p">:</span>
             <span class="n">args</span> <span class="o">=</span> <span class="p">[</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">a</span><span class="p">)</span> <span class="k">for</span> <span class="n">a</span> <span class="ow">in</span> <span class="n">args</span> <span class="p">]</span>
         <span class="k">return</span> <span class="n">libvlc_new</span><span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">),</span> <span class="n">args</span><span class="p">)</span>
@@ -1825,6 +1711,13 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="k">return</span> <span class="n">libvlc_add_intf</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">name</span><span class="p">))</span>
 
     
+    <span class="k">def</span> <span class="nf">wait</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Waits until an interface causes the instance to exit.</span>
+<span class="sd">        You should start at least one interface first, using L{add_intf}().</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">libvlc_wait</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
+
+    
     <span class="k">def</span> <span class="nf">set_user_agent</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">http</span><span class="p">):</span>
         <span class="sd">&#39;&#39;&#39;Sets the application name. LibVLC passes this as the user agent string</span>
 <span class="sd">        when a protocol requires it.</span>
@@ -1875,88 +1768,36 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="k">return</span> <span class="n">libvlc_log_set_file</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">stream</span><span class="p">)</span>
 
     
-    <span class="k">def</span> <span class="nf">media_new_location</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">psz_mrl</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Create a media with a certain given media resource location,</span>
-<span class="sd">        for instance a valid URL.</span>
-<span class="sd">        @note: To refer to a local file with this function,</span>
-<span class="sd">        the file://... URI syntax B{must} be used (see IETF RFC3986).</span>
-<span class="sd">        We recommend using L{media_new_path}() instead when dealing with</span>
-<span class="sd">        local files.</span>
-<span class="sd">        See L{media_release}.</span>
-<span class="sd">        @param psz_mrl: the media location.</span>
-<span class="sd">        @return: the newly created media or None on error.</span>
-<span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_media_new_location</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">psz_mrl</span><span class="p">))</span>
-
-    
-    <span class="k">def</span> <span class="nf">media_new_path</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">path</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Create a media for a certain file path.</span>
-<span class="sd">        See L{media_release}.</span>
-<span class="sd">        @param path: local filesystem path.</span>
-<span class="sd">        @return: the newly created media or None on error.</span>
-<span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_media_new_path</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">path</span><span class="p">))</span>
-
-    
-    <span class="k">def</span> <span class="nf">media_new_fd</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">fd</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Create a media for an already open file descriptor.</span>
-<span class="sd">        The file descriptor shall be open for reading (or reading and writing).</span>
-<span class="sd">        Regular file descriptors, pipe read descriptors and character device</span>
-<span class="sd">        descriptors (including TTYs) are supported on all platforms.</span>
-<span class="sd">        Block device descriptors are supported where available.</span>
-<span class="sd">        Directory descriptors are supported on systems that provide fdopendir().</span>
-<span class="sd">        Sockets are supported on all platforms where they are file descriptors,</span>
-<span class="sd">        i.e. all except Windows.</span>
-<span class="sd">        @note: This library will B{not} automatically close the file descriptor</span>
-<span class="sd">        under any circumstance. Nevertheless, a file descriptor can usually only be</span>
-<span class="sd">        rendered once in a media player. To render it a second time, the file</span>
-<span class="sd">        descriptor should probably be rewound to the beginning with lseek().</span>
-<span class="sd">        See L{media_release}.</span>
-<span class="sd">        @param fd: open file descriptor.</span>
-<span class="sd">        @return: the newly created media or None on error.</span>
-<span class="sd">        @version: LibVLC 1.1.5 and later.</span>
+    <span class="k">def</span> <span class="nf">get_log_verbosity</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Always returns minus one.</span>
+<span class="sd">        This function is only provided for backward compatibility.</span>
+<span class="sd">        @return: always -1.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_media_new_fd</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">fd</span><span class="p">)</span>
+        <span class="k">return</span> <span class="n">libvlc_get_log_verbosity</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
 
     
-    <span class="k">def</span> <span class="nf">media_new_callbacks</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">open_cb</span><span class="p">,</span> <span class="n">read_cb</span><span class="p">,</span> <span class="n">seek_cb</span><span class="p">,</span> <span class="n">close_cb</span><span class="p">,</span> <span class="n">opaque</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Create a media with custom callbacks to read the data from.</span>
-<span class="sd">        @param open_cb: callback to open the custom bitstream input media.</span>
-<span class="sd">        @param read_cb: callback to read data (must not be None).</span>
-<span class="sd">        @param seek_cb: callback to seek, or None if seeking is not supported.</span>
-<span class="sd">        @param close_cb: callback to close the media, or None if unnecessary.</span>
-<span class="sd">        @param opaque: data pointer for the open callback.</span>
-<span class="sd">        @return: the newly created media or None on error @note If open_cb is None, the opaque pointer will be passed to read_cb, seek_cb and close_cb, and the stream size will be treated as unknown. @note The callbacks may be called asynchronously (from another thread). A single stream instance need not be reentrant. However the open_cb needs to be reentrant if the media is used by multiple player instances. @warning The callbacks may be used until all or any player instances that were supplied the media item are stopped. See L{media_release}.</span>
-<span class="sd">        @version: LibVLC 3.0.0 and later.</span>
+    <span class="k">def</span> <span class="nf">set_log_verbosity</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">level</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;This function does nothing.</span>
+<span class="sd">        It is only provided for backward compatibility.</span>
+<span class="sd">        @param level: ignored.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_media_new_callbacks</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">open_cb</span><span class="p">,</span> <span class="n">read_cb</span><span class="p">,</span> <span class="n">seek_cb</span><span class="p">,</span> <span class="n">close_cb</span><span class="p">,</span> <span class="n">opaque</span><span class="p">)</span>
+        <span class="k">return</span> <span class="n">libvlc_set_log_verbosity</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">level</span><span class="p">)</span>
 
     
-    <span class="k">def</span> <span class="nf">media_new_as_node</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Create a media as an empty node with a given name.</span>
-<span class="sd">        See L{media_release}.</span>
-<span class="sd">        @param psz_name: the name of the node.</span>
-<span class="sd">        @return: the new empty media or None on error.</span>
+    <span class="k">def</span> <span class="nf">log_open</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;This function does nothing useful.</span>
+<span class="sd">        It is only provided for backward compatibility.</span>
+<span class="sd">        @return: an unique pointer or None on error.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_media_new_as_node</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">psz_name</span><span class="p">))</span>
+        <span class="k">return</span> <span class="n">libvlc_log_open</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
 
     
-    <span class="k">def</span> <span class="nf">media_discoverer_new</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Create a media discoverer object by name.</span>
-<span class="sd">        After this object is created, you should attach to events in order to be</span>
-<span class="sd">        notified of the discoverer state.</span>
-<span class="sd">        You should also attach to media_list events in order to be notified of new</span>
-<span class="sd">        items discovered.</span>
-<span class="sd">        You need to call L{media_discoverer_start}() in order to start the</span>
-<span class="sd">        discovery.</span>
-<span class="sd">        See L{media_discoverer_media_list}</span>
-<span class="sd">        See L{media_discoverer_event_manager}</span>
-<span class="sd">        See L{media_discoverer_start}.</span>
+    <span class="k">def</span> <span class="nf">media_discoverer_new_from_name</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Discover media service by name.</span>
 <span class="sd">        @param psz_name: service name.</span>
 <span class="sd">        @return: media discover object or None in case of error.</span>
-<span class="sd">        @version: LibVLC 3.0.0 or later.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_media_discoverer_new</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">psz_name</span><span class="p">))</span>
+        <span class="k">return</span> <span class="n">libvlc_media_discoverer_new_from_name</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">psz_name</span><span class="p">))</span>
 
     
     <span class="k">def</span> <span class="nf">media_library_new</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -1966,30 +1807,6 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="k">return</span> <span class="n">libvlc_media_library_new</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
 
     
-    <span class="k">def</span> <span class="nf">audio_output_list_get</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Gets the list of available audio output modules.</span>
-<span class="sd">        @return: list of available audio outputs. It must be freed with In case of error, None is returned.</span>
-<span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_audio_output_list_get</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
-
-    
-    <span class="k">def</span> <span class="nf">audio_output_device_list_get</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">aout</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Gets a list of audio output devices for a given audio output module,</span>
-<span class="sd">        See L{audio_output_device_set}().</span>
-<span class="sd">        @note: Not all audio outputs support this. In particular, an empty (None)</span>
-<span class="sd">        list of devices does B{not} imply that the specified audio output does</span>
-<span class="sd">        not work.</span>
-<span class="sd">        @note: The list might not be exhaustive.</span>
-<span class="sd">        @warning: Some audio output devices in the list might not actually work in</span>
-<span class="sd">        some circumstances. By default, it is recommended to not specify any</span>
-<span class="sd">        explicit audio device.</span>
-<span class="sd">        @param psz_aout: audio output name (as returned by L{audio_output_list_get}()).</span>
-<span class="sd">        @return: A None-terminated linked list of potential audio output devices. It must be freed with L{audio_output_device_list_release}().</span>
-<span class="sd">        @version: LibVLC 2.1.0 or later.</span>
-<span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_audio_output_device_list_get</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">aout</span><span class="p">))</span>
-
-    
     <span class="k">def</span> <span class="nf">vlm_release</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&#39;&#39;&#39;Release the vlm instance related to the given L{Instance}.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
@@ -2222,9 +2039,164 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">        &#39;&#39;&#39;</span>
         <span class="k">return</span> <span class="n">libvlc_vlm_get_event_manager</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
 
+    
+    <span class="k">def</span> <span class="nf">media_new_location</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">psz_mrl</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Create a media with a certain given media resource location,</span>
+<span class="sd">        for instance a valid URL.</span>
+<span class="sd">        @note: To refer to a local file with this function,</span>
+<span class="sd">        the file://... URI syntax B{must} be used (see IETF RFC3986).</span>
+<span class="sd">        We recommend using L{media_new_path}() instead when dealing with</span>
+<span class="sd">        local files.</span>
+<span class="sd">        See L{media_release}.</span>
+<span class="sd">        @param psz_mrl: the media location.</span>
+<span class="sd">        @return: the newly created media or None on error.</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">libvlc_media_new_location</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">psz_mrl</span><span class="p">))</span>
+
+    
+    <span class="k">def</span> <span class="nf">media_new_path</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">path</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Create a media for a certain file path.</span>
+<span class="sd">        See L{media_release}.</span>
+<span class="sd">        @param path: local filesystem path.</span>
+<span class="sd">        @return: the newly created media or None on error.</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">libvlc_media_new_path</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">path</span><span class="p">))</span>
+
+    
+    <span class="k">def</span> <span class="nf">media_new_fd</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">fd</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Create a media for an already open file descriptor.</span>
+<span class="sd">        The file descriptor shall be open for reading (or reading and writing).</span>
+<span class="sd">        Regular file descriptors, pipe read descriptors and character device</span>
+<span class="sd">        descriptors (including TTYs) are supported on all platforms.</span>
+<span class="sd">        Block device descriptors are supported where available.</span>
+<span class="sd">        Directory descriptors are supported on systems that provide fdopendir().</span>
+<span class="sd">        Sockets are supported on all platforms where they are file descriptors,</span>
+<span class="sd">        i.e. all except Windows.</span>
+<span class="sd">        @note: This library will B{not} automatically close the file descriptor</span>
+<span class="sd">        under any circumstance. Nevertheless, a file descriptor can usually only be</span>
+<span class="sd">        rendered once in a media player. To render it a second time, the file</span>
+<span class="sd">        descriptor should probably be rewound to the beginning with lseek().</span>
+<span class="sd">        See L{media_release}.</span>
+<span class="sd">        @param fd: open file descriptor.</span>
+<span class="sd">        @return: the newly created media or None on error.</span>
+<span class="sd">        @version: LibVLC 1.1.5 and later.</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">libvlc_media_new_fd</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">fd</span><span class="p">)</span>
+
+    
+    <span class="k">def</span> <span class="nf">media_new_as_node</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Create a media as an empty node with a given name.</span>
+<span class="sd">        See L{media_release}.</span>
+<span class="sd">        @param psz_name: the name of the node.</span>
+<span class="sd">        @return: the new empty media or None on error.</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">libvlc_media_new_as_node</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">psz_name</span><span class="p">))</span>
+
+    
+    <span class="k">def</span> <span class="nf">playlist_play</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">i_id</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Start playing (if there is any item in the playlist).</span>
+<span class="sd">        Additionnal playlist item options can be specified for addition to the</span>
+<span class="sd">        item before it is played.</span>
+<span class="sd">        @param i_id: the item to play. If this is a negative number, the next item will be selected. Otherwise, the item with the given ID will be played.</span>
+<span class="sd">        @param i_options: the number of options to add to the item.</span>
+<span class="sd">        @param ppsz_options: the options to add to the item.</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">libvlc_playlist_play</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">i_id</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">)</span>
+
+    
+    <span class="k">def</span> <span class="nf">audio_output_list_get</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Gets the list of available audio output modules.</span>
+<span class="sd">        @return: list of available audio outputs. It must be freed it with In case of error, None is returned.</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">libvlc_audio_output_list_get</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
+
+    
+    <span class="k">def</span> <span class="nf">audio_output_device_count</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Backward compatibility stub. Do not use in new code.</span>
+<span class="sd">        Use L{audio_output_device_list_get}() instead.</span>
+<span class="sd">        @param psz_name: name.</span>
+<span class="sd">        @return: always 0.</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">libvlc_audio_output_device_count</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">psz_name</span><span class="p">))</span>
+
+    
+    <span class="k">def</span> <span class="nf">audio_output_device_longname</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="nb">int</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Backward compatibility stub. Do not use in new code.</span>
+<span class="sd">        Use L{audio_output_device_list_get}() instead.</span>
+<span class="sd">        @param psz_name: name.</span>
+<span class="sd">        @param int: index.</span>
+<span class="sd">        @return: always None.</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">libvlc_audio_output_device_longname</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">psz_name</span><span class="p">),</span> <span class="nb">int</span><span class="p">)</span>
+
+    
+    <span class="k">def</span> <span class="nf">audio_output_device_id</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="nb">int</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Backward compatibility stub. Do not use in new code.</span>
+<span class="sd">        Use L{audio_output_device_list_get}() instead.</span>
+<span class="sd">        @param psz_name: name.</span>
+<span class="sd">        @param int: index.</span>
+<span class="sd">        @return: always None.</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">libvlc_audio_output_device_id</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">psz_name</span><span class="p">),</span> <span class="nb">int</span><span class="p">)</span>
+
+    
+    <span class="k">def</span> <span class="nf">audio_output_device_list_get</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">aout</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Gets a list of audio output devices for a given audio output module,</span>
+<span class="sd">        See L{audio_output_device_set}().</span>
+<span class="sd">        @note: Not all audio outputs support this. In particular, an empty (None)</span>
+<span class="sd">        list of devices does B{not} imply that the specified audio output does</span>
+<span class="sd">        not work.</span>
+<span class="sd">        @note: The list might not be exhaustive.</span>
+<span class="sd">        @warning: Some audio output devices in the list might not actually work in</span>
+<span class="sd">        some circumstances. By default, it is recommended to not specify any</span>
+<span class="sd">        explicit audio device.</span>
+<span class="sd">        @param psz_aout: audio output name (as returned by L{audio_output_list_get}()).</span>
+<span class="sd">        @return: A None-terminated linked list of potential audio output devices. It must be freed it with L{audio_output_device_list_release}().</span>
+<span class="sd">        @version: LibVLC 2.1.0 or later.</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">libvlc_audio_output_device_list_get</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">aout</span><span class="p">))</span>
+
+<span class="k">class</span> <span class="nc">LogIterator</span><span class="p">(</span><span class="n">_Ctype</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Create a new VLC log iterator.</span>
+<span class="sd">    </span>
+<span class="sd">    &#39;&#39;&#39;</span>
+
+    <span class="k">def</span> <span class="nf">__new__</span><span class="p">(</span><span class="bp">cls</span><span class="p">,</span> <span class="n">ptr</span><span class="o">=</span><span class="n">_internal_guard</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;(INTERNAL) ctypes wrapper constructor.</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">_Constructor</span><span class="p">(</span><span class="bp">cls</span><span class="p">,</span> <span class="n">ptr</span><span class="p">)</span>
+
+    <span class="k">def</span> <span class="nf">__iter__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="k">return</span> <span class="bp">self</span>
+
+    <span class="k">def</span> <span class="nf">next</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">has_next</span><span class="p">():</span>
+            <span class="n">b</span> <span class="o">=</span> <span class="n">LogMessage</span><span class="p">()</span>
+            <span class="n">i</span> <span class="o">=</span> <span class="n">libvlc_log_iterator_next</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">b</span><span class="p">)</span>
+            <span class="k">return</span> <span class="n">i</span><span class="o">.</span><span class="n">contents</span>
+        <span class="k">raise</span> <span class="ne">StopIteration</span>
+
+    <span class="k">def</span> <span class="nf">__next__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">next</span><span class="p">()</span>
+
+
+    
+    <span class="k">def</span> <span class="nf">free</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Frees memory allocated by L{log_get_iterator}().</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">libvlc_log_iterator_free</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
+
+    
+    <span class="k">def</span> <span class="nf">has_next</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Always returns zero.</span>
+<span class="sd">        This function is only provided for backward compatibility.</span>
+<span class="sd">        @return: always zero.</span>
+<span class="sd">        &#39;&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">libvlc_log_iterator_has_next</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
+
 <span class="k">class</span> <span class="nc">Media</span><span class="p">(</span><span class="n">_Ctype</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Create a new Media instance.</span>
-<span class="sd">    </span>
+
 <span class="sd">    Usage: Media(MRL, *options)</span>
 
 <span class="sd">    See vlc.Instance.media_new documentation for details.</span>
@@ -2268,8 +2240,15 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="n">mediaTrack_pp</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">MediaTrack</span><span class="p">)()</span>
         <span class="n">n</span> <span class="o">=</span> <span class="n">libvlc_media_tracks_get</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">byref</span><span class="p">(</span><span class="n">mediaTrack_pp</span><span class="p">))</span>
-        <span class="n">info</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">cast</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">mediaTrack_pp</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">MediaTrack</span><span class="p">)</span> <span class="o">*</span> <span class="n">n</span><span class="p">))</span>
-        <span class="k">return</span> <span class="n">info</span>
+        <span class="n">info</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">cast</span><span class="p">(</span><span class="n">mediaTrack_pp</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">MediaTrack</span><span class="p">)</span> <span class="o">*</span> <span class="n">n</span><span class="p">))</span>
+        <span class="k">try</span><span class="p">:</span>
+            <span class="n">contents</span> <span class="o">=</span> <span class="n">info</span><span class="o">.</span><span class="n">contents</span>
+        <span class="k">except</span> <span class="ne">ValueError</span><span class="p">:</span>
+            <span class="c1"># Media not parsed, no info.</span>
+            <span class="k">return</span> <span class="kc">None</span>
+        <span class="n">tracks</span> <span class="o">=</span> <span class="p">(</span> <span class="n">contents</span><span class="p">[</span><span class="n">i</span><span class="p">]</span><span class="o">.</span><span class="n">contents</span> <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">contents</span><span class="p">))</span> <span class="p">)</span>
+        <span class="c1"># libvlc_media_tracks_release(mediaTrack_pp, n)</span>
+        <span class="k">return</span> <span class="n">tracks</span>
 
 
     
@@ -2414,18 +2393,18 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
     
     <span class="k">def</span> <span class="nf">parse</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&#39;&#39;&#39;Parse a media.</span>
-<span class="sd">        This fetches (local) art, meta data and tracks information.</span>
+<span class="sd">        This fetches (local) meta data and tracks information.</span>
 <span class="sd">        The method is synchronous.</span>
 <span class="sd">        See L{parse_async}</span>
 <span class="sd">        See L{get_meta}</span>
-<span class="sd">        See libvlc_media_get_tracks_info.</span>
+<span class="sd">        See L{get_tracks_info}.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
         <span class="k">return</span> <span class="n">libvlc_media_parse</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
 
     
     <span class="k">def</span> <span class="nf">parse_async</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&#39;&#39;&#39;Parse a media.</span>
-<span class="sd">        This fetches (local) art, meta data and tracks information.</span>
+<span class="sd">        This fetches (local) meta data and tracks information.</span>
 <span class="sd">        The method is the asynchronous of L{parse}().</span>
 <span class="sd">        To track when this is over you can listen to libvlc_MediaParsedChanged</span>
 <span class="sd">        event. However if the media was already parsed you will not receive this</span>
@@ -2433,32 +2412,11 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">        See L{parse}</span>
 <span class="sd">        See libvlc_MediaParsedChanged</span>
 <span class="sd">        See L{get_meta}</span>
-<span class="sd">        See libvlc_media_get_tracks_info.</span>
+<span class="sd">        See L{get_tracks_info}.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
         <span class="k">return</span> <span class="n">libvlc_media_parse_async</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
 
     
-    <span class="k">def</span> <span class="nf">parse_with_options</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">parse_flag</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Parse the media asynchronously with options.</span>
-<span class="sd">        This fetches (local or network) art, meta data and/or tracks information.</span>
-<span class="sd">        This method is the extended version of L{parse_async}().</span>
-<span class="sd">        To track when this is over you can listen to libvlc_MediaParsedChanged</span>
-<span class="sd">        event. However if this functions returns an error, you will not receive this</span>
-<span class="sd">        event.</span>
-<span class="sd">        It uses a flag to specify parse options (see libvlc_media_parse_flag_t). All</span>
-<span class="sd">        these flags can be combined. By default, media is parsed if it&#39;s a local</span>
-<span class="sd">        file.</span>
-<span class="sd">        See libvlc_MediaParsedChanged</span>
-<span class="sd">        See L{get_meta}</span>
-<span class="sd">        See L{tracks_get}</span>
-<span class="sd">        See libvlc_media_parse_flag_t.</span>
-<span class="sd">        @param parse_flag: parse options:</span>
-<span class="sd">        @return: -1 in case of error, 0 otherwise.</span>
-<span class="sd">        @version: LibVLC 3.0.0 or later.</span>
-<span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_media_parse_with_options</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">parse_flag</span><span class="p">)</span>
-
-    
     <span class="k">def</span> <span class="nf">is_parsed</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&#39;&#39;&#39;Get Parsed status for media descriptor object.</span>
 <span class="sd">        See libvlc_MediaParsedChanged.</span>
@@ -2484,12 +2442,16 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="k">return</span> <span class="n">libvlc_media_get_user_data</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
 
     
-    <span class="k">def</span> <span class="nf">get_type</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Get the media type of the media descriptor object.</span>
-<span class="sd">        @return: media type.</span>
-<span class="sd">        @version: LibVLC 3.0.0 and later. See libvlc_media_type_t.</span>
+    <span class="k">def</span> <span class="nf">get_tracks_info</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&#39;&#39;&#39;Get media descriptor&#39;s elementary streams description</span>
+<span class="sd">        Note, you need to call L{parse}() or play the media at least once</span>
+<span class="sd">        before calling this function.</span>
+<span class="sd">        Not doing this will result in an empty array.</span>
+<span class="sd">        \deprecated Use L{tracks_get} instead.</span>
+<span class="sd">        @param tracks: address to store an allocated array of Elementary Streams descriptions (must be freed by the caller) [OUT].</span>
+<span class="sd">        @return: the number of Elementary Streams.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_media_get_type</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
+        <span class="k">return</span> <span class="n">libvlc_media_get_tracks_info</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
 
     
     <span class="k">def</span> <span class="nf">player_new_from_media</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -2507,25 +2469,6 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">        &#39;&#39;&#39;</span>
         <span class="k">return</span> <span class="n">_Constructor</span><span class="p">(</span><span class="bp">cls</span><span class="p">,</span> <span class="n">ptr</span><span class="p">)</span>
     
-    <span class="k">def</span> <span class="nf">start</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Start media discovery.</span>
-<span class="sd">        To stop it, call L{stop}() or</span>
-<span class="sd">        L{release}() directly.</span>
-<span class="sd">        See L{stop}.</span>
-<span class="sd">        @return: -1 in case of error, 0 otherwise.</span>
-<span class="sd">        @version: LibVLC 3.0.0 or later.</span>
-<span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_media_discoverer_start</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
-
-    
-    <span class="k">def</span> <span class="nf">stop</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Stop media discovery.</span>
-<span class="sd">        See L{start}.</span>
-<span class="sd">        @version: LibVLC 3.0.0 or later.</span>
-<span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_media_discoverer_stop</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
-
-    
     <span class="k">def</span> <span class="nf">release</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&#39;&#39;&#39;Release media discover object. If the reference count reaches 0, then</span>
 <span class="sd">        the object will be released.</span>
@@ -2600,7 +2543,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 
 <span class="k">class</span> <span class="nc">MediaList</span><span class="p">(</span><span class="n">_Ctype</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Create a new MediaList instance.</span>
-<span class="sd">    </span>
+
 <span class="sd">    Usage: MediaList(list_of_MRLs)</span>
 
 <span class="sd">    See vlc.Instance.media_list_new documentation for details.</span>
@@ -2620,10 +2563,10 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 
     <span class="k">def</span> <span class="nf">get_instance</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="k">return</span> <span class="nb">getattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="s1">&#39;_instance&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span>
-    
+
     <span class="k">def</span> <span class="nf">add_media</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">mrl</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot;Add media instance to media list.</span>
-<span class="sd">        </span>
+
 <span class="sd">        The L{lock} should be held upon entering this function.</span>
 <span class="sd">        @param mrl: a media instance or a MRL.</span>
 <span class="sd">        @return: 0 on success, -1 if the media list is read-only.</span>
@@ -2806,13 +2749,6 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="k">return</span> <span class="n">libvlc_media_list_player_set_media_player</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">p_mi</span><span class="p">)</span>
 
     
-    <span class="k">def</span> <span class="nf">get_media_player</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Get media player of the media_list_player instance.</span>
-<span class="sd">        @return: media player instance @note the caller is responsible for releasing the returned instance.</span>
-<span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_media_list_player_get_media_player</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
-
-    
     <span class="k">def</span> <span class="nf">set_media_list</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">p_mlist</span><span class="p">):</span>
         <span class="sd">&#39;&#39;&#39;Set the media list associated with the player.</span>
 <span class="sd">        @param p_mlist: list of media.</span>
@@ -2907,7 +2843,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
     <span class="k">def</span> <span class="nf">__new__</span><span class="p">(</span><span class="bp">cls</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">):</span>
         <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">==</span> <span class="mi">1</span> <span class="ow">and</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">args</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span> <span class="n">_Ints</span><span class="p">):</span>
             <span class="k">return</span> <span class="n">_Constructor</span><span class="p">(</span><span class="bp">cls</span><span class="p">,</span> <span class="n">args</span><span class="p">[</span><span class="mi">0</span><span class="p">])</span>
-        
+
         <span class="k">if</span> <span class="n">args</span> <span class="ow">and</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">args</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span> <span class="n">Instance</span><span class="p">):</span>
             <span class="n">instance</span> <span class="o">=</span> <span class="n">args</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
             <span class="n">args</span> <span class="o">=</span> <span class="n">args</span><span class="p">[</span><span class="mi">1</span><span class="p">:]</span>
@@ -2978,8 +2914,8 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 
     <span class="k">def</span> <span class="nf">get_full_chapter_descriptions</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">i_chapters_of_title</span><span class="p">):</span>
         <span class="sd">&#39;&#39;&#39;Get the full description of available chapters.</span>
-<span class="sd">        @param index: of the title to query for chapters.</span>
-<span class="sd">        @return: the chapter list</span>
+<span class="sd">        @param i_chapters_of_title: index of the title to query for chapters (uses current title if set to -1).</span>
+<span class="sd">        @return: the chapters list</span>
 <span class="sd">        @version: LibVLC 3.0.0 and later.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
         <span class="n">chapterDescription_pp</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ChapterDescription</span><span class="p">)()</span>
@@ -3004,13 +2940,13 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">        Specify where the media player should render its video</span>
 <span class="sd">        output. If LibVLC was built without Win32/Win64 API output</span>
 <span class="sd">        support, then this has no effects.</span>
-<span class="sd">           </span>
+
 <span class="sd">        @param drawable: windows handle of the drawable.</span>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="k">if</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">drawable</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">):</span>
             <span class="n">drawable</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">(</span><span class="nb">int</span><span class="p">(</span><span class="n">drawable</span><span class="p">))</span>
         <span class="n">libvlc_media_player_set_hwnd</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">drawable</span><span class="p">)</span>
-            
+
     <span class="k">def</span> <span class="nf">video_get_width</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">num</span><span class="o">=</span><span class="mi">0</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot;Get the width of a video in pixels.</span>
 
@@ -3167,7 +3103,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">        Use the vout called &quot;macosx&quot;.</span>
 <span class="sd">        The drawable is an NSObject that follow the VLCOpenGLVideoViewEmbedding</span>
 <span class="sd">        protocol:</span>
-<span class="sd">        @code.m</span>
+<span class="sd">        @begincode</span>
 <span class="sd">        \@protocol VLCOpenGLVideoViewEmbedding &lt;NSObject&gt;</span>
 <span class="sd">        - (void)addVoutSubview:(NSView *)view;</span>
 <span class="sd">        - (void)removeVoutSubview:(NSView *)view;</span>
@@ -3176,7 +3112,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">        Or it can be an NSView object.</span>
 <span class="sd">        If you want to use it along with Qt4 see the QMacCocoaViewContainer. Then</span>
 <span class="sd">        the following code should work:</span>
-<span class="sd">        @code.mm</span>
+<span class="sd">        @begincode</span>
 <span class="sd">        </span>
 <span class="sd">            NSView *video = [[NSView alloc] init];</span>
 <span class="sd">            QMacCocoaViewContainer *container = new QMacCocoaViewContainer(video, parent);</span>
@@ -3198,36 +3134,29 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 
     
     <span class="k">def</span> <span class="nf">set_agl</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">drawable</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;\deprecated Use L{set_nsobject} instead.</span>
+        <span class="sd">&#39;&#39;&#39;Set the agl handler where the media player should render its video output.</span>
+<span class="sd">        @param drawable: the agl handler.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
         <span class="k">return</span> <span class="n">libvlc_media_player_set_agl</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">drawable</span><span class="p">)</span>
 
     
     <span class="k">def</span> <span class="nf">get_agl</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;\deprecated Use L{get_nsobject} instead.</span>
+        <span class="sd">&#39;&#39;&#39;Get the agl handler previously set with L{set_agl}().</span>
+<span class="sd">        @return: the agl handler or 0 if none where set.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
         <span class="k">return</span> <span class="n">libvlc_media_player_get_agl</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
 
     
     <span class="k">def</span> <span class="nf">set_xwindow</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">drawable</span><span class="p">):</span>
         <span class="sd">&#39;&#39;&#39;Set an X Window System drawable where the media player should render its</span>
-<span class="sd">        video output. The call takes effect when the playback starts. If it is</span>
-<span class="sd">        already started, it might need to be stopped before changes apply.</span>
-<span class="sd">        If LibVLC was built without X11 output support, then this function has no</span>
-<span class="sd">        effects.</span>
-<span class="sd">        By default, LibVLC will capture input events on the video rendering area.</span>
-<span class="sd">        Use L{video_set_mouse_input}() and L{video_set_key_input}() to</span>
-<span class="sd">        disable that and deliver events to the parent window / to the application</span>
-<span class="sd">        instead. By design, the X11 protocol delivers input events to only one</span>
-<span class="sd">        recipient.</span>
-<span class="sd">        @warning</span>
-<span class="sd">        The application must call the XInitThreads() function from Xlib before</span>
-<span class="sd">        L{new}(), and before any call to XOpenDisplay() directly or via any</span>
-<span class="sd">        other library. Failure to call XInitThreads() will seriously impede LibVLC</span>
-<span class="sd">        performance. Calling XOpenDisplay() before XInitThreads() will eventually</span>
-<span class="sd">        crash the process. That is a limitation of Xlib.</span>
-<span class="sd">        @param drawable: X11 window ID @note The specified identifier must correspond to an existing Input/Output class X11 window. Pixmaps are B{not} currently supported. The default X11 server is assumed, i.e. that specified in the DISPLAY environment variable. @warning LibVLC can deal with invalid X11 handle errors, however some display drivers (EGL, GLX, VA and/or VDPAU) can unfortunately not. Thus the window handle must remain valid until playback is stopped, otherwise the process may abort or crash.</span>
-<span class="sd">        @bug No more than one window handle per media player instance can be specified. If the media has multiple simultaneously active video tracks, extra tracks will be rendered into external windows beyond the control of the application.</span>
+<span class="sd">        video output. If LibVLC was built without X11 output support, then this has</span>
+<span class="sd">        no effects.</span>
+<span class="sd">        The specified identifier must correspond to an existing Input/Output class</span>
+<span class="sd">        X11 window. Pixmaps are B{not} supported. The caller shall ensure that</span>
+<span class="sd">        the X11 server is the same as the one the VLC instance has been configured</span>
+<span class="sd">        with. This function must be called before video playback is started;</span>
+<span class="sd">        otherwise it will only take effect after playback stop and restart.</span>
+<span class="sd">        @param drawable: the ID of the X window.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
         <span class="k">return</span> <span class="n">libvlc_media_player_set_xwindow</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">drawable</span><span class="p">)</span>
 
@@ -3251,15 +3180,6 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="k">return</span> <span class="n">libvlc_media_player_get_hwnd</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
 
     
-    <span class="k">def</span> <span class="nf">set_android_context</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">p_jvm</span><span class="p">,</span> <span class="n">p_awindow_handler</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Set the android context.</span>
-<span class="sd">        @param p_jvm: the Java VM of the android process.</span>
-<span class="sd">        @param awindow_handler: org.videolan.libvlc.IAWindowNativeHandler jobject implemented by the org.videolan.libvlc.MediaPlayer class from the libvlc-android project.</span>
-<span class="sd">        @version: LibVLC 3.0.0 and later.</span>
-<span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_media_player_set_android_context</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">p_jvm</span><span class="p">,</span> <span class="n">p_awindow_handler</span><span class="p">)</span>
-
-    
     <span class="k">def</span> <span class="nf">audio_set_callbacks</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">play</span><span class="p">,</span> <span class="n">pause</span><span class="p">,</span> <span class="n">resume</span><span class="p">,</span> <span class="n">flush</span><span class="p">,</span> <span class="n">drain</span><span class="p">,</span> <span class="n">opaque</span><span class="p">):</span>
         <span class="sd">&#39;&#39;&#39;Set callbacks and private data for decoded audio.</span>
 <span class="sd">        Use L{audio_set_format}() or L{audio_set_format_callbacks}()</span>
@@ -3827,7 +3747,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">        @warning: Some audio output devices in the list might not actually work in</span>
 <span class="sd">        some circumstances. By default, it is recommended to not specify any</span>
 <span class="sd">        explicit audio device.</span>
-<span class="sd">        @return: A None-terminated linked list of potential audio output devices. It must be freed with L{audio_output_device_list_release}().</span>
+<span class="sd">        @return: A None-terminated linked list of potential audio output devices. It must be freed it with L{audio_output_device_list_release}().</span>
 <span class="sd">        @version: LibVLC 2.2.0 or later.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
         <span class="k">return</span> <span class="n">libvlc_audio_output_device_enum</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
@@ -3861,24 +3781,6 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="k">return</span> <span class="n">libvlc_audio_output_device_set</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">module</span><span class="p">),</span> <span class="n">str_to_bytes</span><span class="p">(</span><span class="n">device_id</span><span class="p">))</span>
 
     
-    <span class="k">def</span> <span class="nf">audio_output_device_get</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="sd">&#39;&#39;&#39;Get the current audio output device identifier.</span>
-<span class="sd">        This complements L{audio_output_device_set}().</span>
-<span class="sd">        @warning: The initial value for the current audio output device identifier</span>
-<span class="sd">        may not be set or may be some unknown value. A LibVLC application should</span>
-<span class="sd">        compare this value against the known device identifiers (e.g. those that</span>
-<span class="sd">        were previously retrieved by a call to L{audio_output_device_enum} or</span>
-<span class="sd">        L{audio_output_device_list_get}) to find the current audio output device.</span>
-<span class="sd">        It is possible that the selected audio output device changes (an external</span>
-<span class="sd">        change) without a call to L{audio_output_device_set}. That may make this</span>
-<span class="sd">        method unsuitable to use if a LibVLC application is attempting to track</span>
-<span class="sd">        dynamic audio device changes as they happen.</span>
-<span class="sd">        @return: the current audio output device identifier None if no device is selected or in case of error (the result must be released with free() or L{free}()).</span>
-<span class="sd">        @version: LibVLC 3.0.0 or later.</span>
-<span class="sd">        &#39;&#39;&#39;</span>
-        <span class="k">return</span> <span class="n">libvlc_audio_output_device_get</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span>
-
-    
     <span class="k">def</span> <span class="nf">audio_toggle_mute</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&#39;&#39;&#39;Toggle mute status.</span>
 <span class="sd">        &#39;&#39;&#39;</span>
@@ -3993,18 +3895,6 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 
  <span class="c1"># LibVLC __version__ functions #</span>
 
-<span class="k">def</span> <span class="nf">libvlc_errmsg</span><span class="p">():</span>
-    <span class="sd">&#39;&#39;&#39;A human-readable error message for the last LibVLC error in the calling</span>
-<span class="sd">    thread. The resulting string is valid until another error occurs (at least</span>
-<span class="sd">    until the next LibVLC call).</span>
-<span class="sd">    @warning</span>
-<span class="sd">    This will be None if there was no error.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_errmsg&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_errmsg&#39;</span><span class="p">,</span> <span class="p">(),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">()</span>
-
 <span class="k">def</span> <span class="nf">libvlc_clearerr</span><span class="p">():</span>
     <span class="sd">&#39;&#39;&#39;Clears the LibVLC error status for the current thread. This is optional.</span>
 <span class="sd">    By default, the error status is automatically overridden when a new error</span>
@@ -4031,27 +3921,6 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
     <span class="sd">&#39;&#39;&#39;Create and initialize a libvlc instance.</span>
 <span class="sd">    This functions accept a list of &quot;command line&quot; arguments similar to the</span>
 <span class="sd">    main(). These arguments affect the LibVLC instance default configuration.</span>
-<span class="sd">    @note</span>
-<span class="sd">    LibVLC may create threads. Therefore, any thread-unsafe process</span>
-<span class="sd">    initialization must be performed before calling L{libvlc_new}(). In particular</span>
-<span class="sd">    and where applicable:</span>
-<span class="sd">    - setlocale() and textdomain(),</span>
-<span class="sd">    - setenv(), unsetenv() and putenv(),</span>
-<span class="sd">    - with the X11 display system, XInitThreads()</span>
-<span class="sd">      (see also L{libvlc_media_player_set_xwindow}()) and</span>
-<span class="sd">    - on Microsoft Windows, SetErrorMode().</span>
-<span class="sd">    - sigprocmask() shall never be invoked; pthread_sigmask() can be used.</span>
-<span class="sd">    On POSIX systems, the SIGCHLD signal must B{not} be ignored, i.e. the</span>
-<span class="sd">    signal handler must set to SIG_DFL or a function pointer, not SIG_IGN.</span>
-<span class="sd">    Also while LibVLC is active, the wait() function shall not be called, and</span>
-<span class="sd">    any call to waitpid() shall use a strictly positive value for the first</span>
-<span class="sd">    parameter (i.e. the PID). Failure to follow those rules may lead to a</span>
-<span class="sd">    deadlock or a busy loop.</span>
-<span class="sd">    Also on POSIX systems, it is recommended that the SIGPIPE signal be blocked,</span>
-<span class="sd">    even if it is not, in principles, necessary.</span>
-<span class="sd">    On Microsoft Windows Vista/2008, the process error mode</span>
-<span class="sd">    SEM_FAILCRITICALERRORS flag B{must} with the SetErrorMode() function</span>
-<span class="sd">    before using LibVLC. On later versions, it is optional and unnecessary.</span>
 <span class="sd">    @param argc: the number of arguments (should be 0).</span>
 <span class="sd">    @param argv: list of arguments (should be None).</span>
 <span class="sd">    @return: the libvlc instance or None in case of error.</span>
@@ -4093,6 +3962,16 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
                     <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
     <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">name</span><span class="p">)</span>
 
+<span class="k">def</span> <span class="nf">libvlc_wait</span><span class="p">(</span><span class="n">p_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Waits until an interface causes the instance to exit.</span>
+<span class="sd">    You should start at least one interface first, using L{libvlc_add_intf}().</span>
+<span class="sd">    @param p_instance: the instance @warning This function wastes one thread doing basically nothing. libvlc_set_exit_handler() should be used instead.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_wait&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_wait&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">Instance</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">)</span>
+
 <span class="k">def</span> <span class="nf">libvlc_set_user_agent</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">http</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Sets the application name. LibVLC passes this as the user agent string</span>
 <span class="sd">    when a protocol requires it.</span>
@@ -4266,6 +4145,112 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
                     <span class="kc">None</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">FILE_ptr</span><span class="p">)</span>
     <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">stream</span><span class="p">)</span>
 
+<span class="k">def</span> <span class="nf">libvlc_get_log_verbosity</span><span class="p">(</span><span class="n">p_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Always returns minus one.</span>
+<span class="sd">    This function is only provided for backward compatibility.</span>
+<span class="sd">    @param p_instance: ignored.</span>
+<span class="sd">    @return: always -1.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_get_log_verbosity&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_get_log_verbosity&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">,</span> <span class="n">Instance</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_set_log_verbosity</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">level</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;This function does nothing.</span>
+<span class="sd">    It is only provided for backward compatibility.</span>
+<span class="sd">    @param p_instance: ignored.</span>
+<span class="sd">    @param level: ignored.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_set_log_verbosity&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_set_log_verbosity&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">level</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_log_open</span><span class="p">(</span><span class="n">p_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;This function does nothing useful.</span>
+<span class="sd">    It is only provided for backward compatibility.</span>
+<span class="sd">    @param p_instance: libvlc instance.</span>
+<span class="sd">    @return: an unique pointer or None on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_log_open&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_log_open&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">Log_ptr</span><span class="p">,</span> <span class="n">Instance</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_log_close</span><span class="p">(</span><span class="n">p_log</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Frees memory allocated by L{libvlc_log_open}().</span>
+<span class="sd">    @param p_log: libvlc log instance or None.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_log_close&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_log_close&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">Log_ptr</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_log</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_log_count</span><span class="p">(</span><span class="n">p_log</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Always returns zero.</span>
+<span class="sd">    This function is only provided for backward compatibility.</span>
+<span class="sd">    @param p_log: ignored.</span>
+<span class="sd">    @return: always zero.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_log_count&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_log_count&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">,</span> <span class="n">Log_ptr</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_log</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_log_clear</span><span class="p">(</span><span class="n">p_log</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;This function does nothing.</span>
+<span class="sd">    It is only provided for backward compatibility.</span>
+<span class="sd">    @param p_log: ignored.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_log_clear&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_log_clear&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">Log_ptr</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_log</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_log_get_iterator</span><span class="p">(</span><span class="n">p_log</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;This function does nothing useful.</span>
+<span class="sd">    It is only provided for backward compatibility.</span>
+<span class="sd">    @param p_log: ignored.</span>
+<span class="sd">    @return: an unique pointer or None on error or if the parameter was None.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_log_get_iterator&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_log_get_iterator&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">LogIterator</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Log_ptr</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_log</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_log_iterator_free</span><span class="p">(</span><span class="n">p_iter</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Frees memory allocated by L{libvlc_log_get_iterator}().</span>
+<span class="sd">    @param p_iter: libvlc log iterator or None.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_log_iterator_free&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_log_iterator_free&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">LogIterator</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_iter</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_log_iterator_has_next</span><span class="p">(</span><span class="n">p_iter</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Always returns zero.</span>
+<span class="sd">    This function is only provided for backward compatibility.</span>
+<span class="sd">    @param p_iter: ignored.</span>
+<span class="sd">    @return: always zero.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_log_iterator_has_next&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_log_iterator_has_next&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">LogIterator</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_iter</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_log_iterator_next</span><span class="p">(</span><span class="n">p_iter</span><span class="p">,</span> <span class="n">p_buf</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Always returns None.</span>
+<span class="sd">    This function is only provided for backward compatibility.</span>
+<span class="sd">    @param p_iter: libvlc log iterator or None.</span>
+<span class="sd">    @param p_buf: ignored.</span>
+<span class="sd">    @return: always None.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_log_iterator_next&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_log_iterator_next&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">LogMessage</span><span class="p">),</span> <span class="n">LogIterator</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">LogMessage</span><span class="p">))</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_iter</span><span class="p">,</span> <span class="n">p_buf</span><span class="p">)</span>
+
 <span class="k">def</span> <span class="nf">libvlc_module_description_list_release</span><span class="p">(</span><span class="n">p_list</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Release a list of module descriptions.</span>
 <span class="sd">    @param p_list: the list to be released.</span>
@@ -4308,174 +4293,576 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
                     <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int64</span><span class="p">)</span>
     <span class="k">return</span> <span class="n">f</span><span class="p">()</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_new_location</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_mrl</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Create a media with a certain given media resource location,</span>
-<span class="sd">    for instance a valid URL.</span>
-<span class="sd">    @note: To refer to a local file with this function,</span>
-<span class="sd">    the file://... URI syntax B{must} be used (see IETF RFC3986).</span>
-<span class="sd">    We recommend using L{libvlc_media_new_path}() instead when dealing with</span>
-<span class="sd">    local files.</span>
-<span class="sd">    See L{libvlc_media_release}.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_mrl: the media location.</span>
-<span class="sd">    @return: the newly created media or None on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_discoverer_new_from_name</span><span class="p">(</span><span class="n">p_inst</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Discover media service by name.</span>
+<span class="sd">    @param p_inst: libvlc instance.</span>
+<span class="sd">    @param psz_name: service name.</span>
+<span class="sd">    @return: media discover object or None in case of error.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_location&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_location&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">Media</span><span class="p">),</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_new_from_name&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_new_from_name&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">MediaDiscoverer</span><span class="p">),</span>
                     <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_mrl</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_inst</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_new_path</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">path</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Create a media for a certain file path.</span>
-<span class="sd">    See L{libvlc_media_release}.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param path: local filesystem path.</span>
-<span class="sd">    @return: the newly created media or None on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_discoverer_release</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Release media discover object. If the reference count reaches 0, then</span>
+<span class="sd">    the object will be released.</span>
+<span class="sd">    @param p_mdis: media service discover object.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_path&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_path&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">Media</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">path</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaDiscoverer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_new_fd</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">fd</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Create a media for an already open file descriptor.</span>
-<span class="sd">    The file descriptor shall be open for reading (or reading and writing).</span>
-<span class="sd">    Regular file descriptors, pipe read descriptors and character device</span>
-<span class="sd">    descriptors (including TTYs) are supported on all platforms.</span>
-<span class="sd">    Block device descriptors are supported where available.</span>
-<span class="sd">    Directory descriptors are supported on systems that provide fdopendir().</span>
-<span class="sd">    Sockets are supported on all platforms where they are file descriptors,</span>
-<span class="sd">    i.e. all except Windows.</span>
-<span class="sd">    @note: This library will B{not} automatically close the file descriptor</span>
-<span class="sd">    under any circumstance. Nevertheless, a file descriptor can usually only be</span>
-<span class="sd">    rendered once in a media player. To render it a second time, the file</span>
-<span class="sd">    descriptor should probably be rewound to the beginning with lseek().</span>
-<span class="sd">    See L{libvlc_media_release}.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param fd: open file descriptor.</span>
-<span class="sd">    @return: the newly created media or None on error.</span>
-<span class="sd">    @version: LibVLC 1.1.5 and later.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_discoverer_localized_name</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get media service discover object its localized name.</span>
+<span class="sd">    @param p_mdis: media discover object.</span>
+<span class="sd">    @return: localized name.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_fd&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_fd&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">Media</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">fd</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_new_callbacks</span><span class="p">(</span><span class="n">instance</span><span class="p">,</span> <span class="n">open_cb</span><span class="p">,</span> <span class="n">read_cb</span><span class="p">,</span> <span class="n">seek_cb</span><span class="p">,</span> <span class="n">close_cb</span><span class="p">,</span> <span class="n">opaque</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Create a media with custom callbacks to read the data from.</span>
-<span class="sd">    @param instance: LibVLC instance.</span>
-<span class="sd">    @param open_cb: callback to open the custom bitstream input media.</span>
-<span class="sd">    @param read_cb: callback to read data (must not be None).</span>
-<span class="sd">    @param seek_cb: callback to seek, or None if seeking is not supported.</span>
-<span class="sd">    @param close_cb: callback to close the media, or None if unnecessary.</span>
-<span class="sd">    @param opaque: data pointer for the open callback.</span>
-<span class="sd">    @return: the newly created media or None on error @note If open_cb is None, the opaque pointer will be passed to read_cb, seek_cb and close_cb, and the stream size will be treated as unknown. @note The callbacks may be called asynchronously (from another thread). A single stream instance need not be reentrant. However the open_cb needs to be reentrant if the media is used by multiple player instances. @warning The callbacks may be used until all or any player instances that were supplied the media item are stopped. See L{libvlc_media_release}.</span>
-<span class="sd">    @version: LibVLC 3.0.0 and later.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_callbacks&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_callbacks&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">Media</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">MediaOpenCb</span><span class="p">,</span> <span class="n">MediaReadCb</span><span class="p">,</span> <span class="n">MediaSeekCb</span><span class="p">,</span> <span class="n">MediaCloseCb</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">instance</span><span class="p">,</span> <span class="n">open_cb</span><span class="p">,</span> <span class="n">read_cb</span><span class="p">,</span> <span class="n">seek_cb</span><span class="p">,</span> <span class="n">close_cb</span><span class="p">,</span> <span class="n">opaque</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_localized_name&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_localized_name&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">string_result</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaDiscoverer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_new_as_node</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Create a media as an empty node with a given name.</span>
-<span class="sd">    See L{libvlc_media_release}.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the name of the node.</span>
-<span class="sd">    @return: the new empty media or None on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_discoverer_media_list</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get media service discover media list.</span>
+<span class="sd">    @param p_mdis: media service discover object.</span>
+<span class="sd">    @return: list of media items.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_as_node&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_as_node&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">Media</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_media_list&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_media_list&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">MediaList</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaDiscoverer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_add_option</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">psz_options</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Add an option to the media.</span>
-<span class="sd">    This option will be used to determine how the media_player will</span>
-<span class="sd">    read the media. This allows to use VLC&#39;s advanced</span>
-<span class="sd">    reading/streaming options on a per-media basis.</span>
-<span class="sd">    @note: The options are listed in &#39;vlc --long-help&#39; from the command line,</span>
-<span class="sd">    e.g. &quot;-sout-all&quot;. Keep in mind that available options and their semantics</span>
-<span class="sd">    vary across LibVLC versions and builds.</span>
-<span class="sd">    @warning: Not all options affects L{Media} objects:</span>
-<span class="sd">    Specifically, due to architectural issues most audio and video options,</span>
-<span class="sd">    such as text renderer options, have no effects on an individual media.</span>
-<span class="sd">    These options must be set through L{libvlc_new}() instead.</span>
-<span class="sd">    @param p_md: the media descriptor.</span>
-<span class="sd">    @param psz_options: the options (as a string).</span>
+<span class="k">def</span> <span class="nf">libvlc_media_discoverer_event_manager</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get event manager from media service discover object.</span>
+<span class="sd">    @param p_mdis: media service discover object.</span>
+<span class="sd">    @return: event manager object.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_add_option&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_add_option&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">Media</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">psz_options</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_event_manager&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_event_manager&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">EventManager</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaDiscoverer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_add_option_flag</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">psz_options</span><span class="p">,</span> <span class="n">i_flags</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Add an option to the media with configurable flags.</span>
-<span class="sd">    This option will be used to determine how the media_player will</span>
-<span class="sd">    read the media. This allows to use VLC&#39;s advanced</span>
-<span class="sd">    reading/streaming options on a per-media basis.</span>
-<span class="sd">    The options are detailed in vlc --long-help, for instance</span>
-<span class="sd">    &quot;--sout-all&quot;. Note that all options are not usable on medias:</span>
-<span class="sd">    specifically, due to architectural issues, video-related options</span>
-<span class="sd">    such as text renderer options cannot be set on a single media. They</span>
-<span class="sd">    must be set on the whole libvlc instance instead.</span>
-<span class="sd">    @param p_md: the media descriptor.</span>
-<span class="sd">    @param psz_options: the options (as a string).</span>
-<span class="sd">    @param i_flags: the flags for this option.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_discoverer_is_running</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Query if media service discover object is running.</span>
+<span class="sd">    @param p_mdis: media service discover object.</span>
+<span class="sd">    @return: true if running, false if not \libvlc_return_bool.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_add_option_flag&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_add_option_flag&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">Media</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">psz_options</span><span class="p">,</span> <span class="n">i_flags</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_is_running&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_is_running&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaDiscoverer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_retain</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Retain a reference to a media descriptor object (libvlc_media_t). Use</span>
-<span class="sd">    L{libvlc_media_release}() to decrement the reference count of a</span>
-<span class="sd">    media descriptor object.</span>
-<span class="sd">    @param p_md: the media descriptor.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_library_new</span><span class="p">(</span><span class="n">p_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Create an new Media Library object.</span>
+<span class="sd">    @param p_instance: the libvlc instance.</span>
+<span class="sd">    @return: a new object or None on error.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_retain&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_retain&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_new&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_new&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">MediaLibrary</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_release</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Decrement the reference count of a media descriptor object. If the</span>
-<span class="sd">    reference count is 0, then L{libvlc_media_release}() will release the</span>
-<span class="sd">    media descriptor object. It will send out an libvlc_MediaFreed event</span>
-<span class="sd">    to all listeners. If the media descriptor object has been released it</span>
-<span class="sd">    should not be used again.</span>
-<span class="sd">    @param p_md: the media descriptor.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_library_release</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Release media library object. This functions decrements the</span>
+<span class="sd">    reference count of the media library object. If it reaches 0,</span>
+<span class="sd">    then the object will be released.</span>
+<span class="sd">    @param p_mlib: media library object.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaLibrary</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_get_mrl</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get the media resource locator (mrl) from a media descriptor object.</span>
-<span class="sd">    @param p_md: a media descriptor object.</span>
-<span class="sd">    @return: string with mrl of media descriptor object.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_library_retain</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Retain a reference to a media library object. This function will</span>
+<span class="sd">    increment the reference counting for this object. Use</span>
+<span class="sd">    L{libvlc_media_library_release}() to decrement the reference count.</span>
+<span class="sd">    @param p_mlib: media library object.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_mrl&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_mrl&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">string_result</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_retain&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_retain&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaLibrary</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_duplicate</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Duplicate a media descriptor object.</span>
-<span class="sd">    @param p_md: a media descriptor object.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_library_load</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Load media library.</span>
+<span class="sd">    @param p_mlib: media library object.</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_duplicate&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_duplicate&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">Media</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_load&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_load&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaLibrary</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_get_meta</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">e_meta</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Read the meta of the media.</span>
-<span class="sd">    If the media has not yet been parsed this will return None.</span>
-<span class="sd">    This methods automatically calls L{libvlc_media_parse_async}(), so after calling</span>
-<span class="sd">    it you may receive a libvlc_MediaMetaChanged event. If you prefer a synchronous</span>
+<span class="k">def</span> <span class="nf">libvlc_media_library_media_list</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get media library subitems.</span>
+<span class="sd">    @param p_mlib: media library object.</span>
+<span class="sd">    @return: media list subitems.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_media_list&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_media_list&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">MediaList</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaLibrary</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_release</span><span class="p">(</span><span class="n">p_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Release the vlm instance related to the given L{Instance}.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">Instance</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_add_broadcast</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">,</span> <span class="n">psz_output</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">,</span> <span class="n">b_loop</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Add a broadcast, with one input.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the name of the new broadcast.</span>
+<span class="sd">    @param psz_input: the input MRL.</span>
+<span class="sd">    @param psz_output: the output MRL (the parameter to the &quot;sout&quot; variable).</span>
+<span class="sd">    @param i_options: number of additional options.</span>
+<span class="sd">    @param ppsz_options: additional options.</span>
+<span class="sd">    @param b_enabled: boolean for enabling the new broadcast.</span>
+<span class="sd">    @param b_loop: Should this broadcast be played in loop ?</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_add_broadcast&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_add_broadcast&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ListPOINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">,</span> <span class="n">psz_output</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">,</span> <span class="n">b_loop</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_add_vod</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">,</span> <span class="n">psz_mux</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Add a vod, with one input.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the name of the new vod media.</span>
+<span class="sd">    @param psz_input: the input MRL.</span>
+<span class="sd">    @param i_options: number of additional options.</span>
+<span class="sd">    @param ppsz_options: additional options.</span>
+<span class="sd">    @param b_enabled: boolean for enabling the new vod.</span>
+<span class="sd">    @param psz_mux: the muxer of the vod media.</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_add_vod&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_add_vod&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ListPOINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">,</span> <span class="n">psz_mux</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_del_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Delete a media (VOD or broadcast).</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the media to delete.</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_del_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_del_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_set_enabled</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Enable or disable a media (VOD or broadcast).</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the media to work on.</span>
+<span class="sd">    @param b_enabled: the new status.</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_enabled&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_enabled&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_set_output</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_output</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Set the output for a media.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the media to work on.</span>
+<span class="sd">    @param psz_output: the output MRL (the parameter to the &quot;sout&quot; variable).</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_output&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_output&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_output</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_set_input</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Set a media&#39;s input MRL. This will delete all existing inputs and</span>
+<span class="sd">    add the specified one.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the media to work on.</span>
+<span class="sd">    @param psz_input: the input MRL.</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_input&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_input&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_add_input</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Add a media&#39;s input MRL. This will add the specified one.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the media to work on.</span>
+<span class="sd">    @param psz_input: the input MRL.</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_add_input&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_add_input&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_set_loop</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">b_loop</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Set a media&#39;s loop status.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the media to work on.</span>
+<span class="sd">    @param b_loop: the new status.</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_loop&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_loop&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">b_loop</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_set_mux</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_mux</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Set a media&#39;s vod muxer.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the media to work on.</span>
+<span class="sd">    @param psz_mux: the new muxer.</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_mux&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_mux&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_mux</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_change_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">,</span> <span class="n">psz_output</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">,</span> <span class="n">b_loop</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Edit the parameters of a media. This will delete all existing inputs and</span>
+<span class="sd">    add the specified one.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the name of the new broadcast.</span>
+<span class="sd">    @param psz_input: the input MRL.</span>
+<span class="sd">    @param psz_output: the output MRL (the parameter to the &quot;sout&quot; variable).</span>
+<span class="sd">    @param i_options: number of additional options.</span>
+<span class="sd">    @param ppsz_options: additional options.</span>
+<span class="sd">    @param b_enabled: boolean for enabling the new broadcast.</span>
+<span class="sd">    @param b_loop: Should this broadcast be played in loop ?</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_change_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_change_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ListPOINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">,</span> <span class="n">psz_output</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">,</span> <span class="n">b_loop</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_play_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Play the named broadcast.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the name of the broadcast.</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_play_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_play_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_stop_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Stop the named broadcast.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the name of the broadcast.</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_stop_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_stop_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_pause_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Pause the named broadcast.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the name of the broadcast.</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_pause_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_pause_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_seek_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">f_percentage</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Seek in the named broadcast.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the name of the broadcast.</span>
+<span class="sd">    @param f_percentage: the percentage to seek to.</span>
+<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_seek_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_seek_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_float</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">f_percentage</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_show_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Return information about the named media as a JSON</span>
+<span class="sd">    string representation.</span>
+<span class="sd">    This function is mainly intended for debugging use,</span>
+<span class="sd">    if you want programmatic access to the state of</span>
+<span class="sd">    a vlm_media_instance_t, please use the corresponding</span>
+<span class="sd">    libvlc_vlm_get_media_instance_xxx -functions.</span>
+<span class="sd">    Currently there are no such functions available for</span>
+<span class="sd">    vlm_media_t though.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the name of the media, if the name is an empty string, all media is described.</span>
+<span class="sd">    @return: string with information about named media, or None on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_show_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_show_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">string_result</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_position</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get vlm_media instance position by name or instance id.</span>
+<span class="sd">    @param p_instance: a libvlc instance.</span>
+<span class="sd">    @param psz_name: name of vlm media instance.</span>
+<span class="sd">    @param i_instance: instance id.</span>
+<span class="sd">    @return: position as float or -1. on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_position&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_position&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_float</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_time</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get vlm_media instance time by name or instance id.</span>
+<span class="sd">    @param p_instance: a libvlc instance.</span>
+<span class="sd">    @param psz_name: name of vlm media instance.</span>
+<span class="sd">    @param i_instance: instance id.</span>
+<span class="sd">    @return: time as integer or -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_time&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_time&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_length</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get vlm_media instance length by name or instance id.</span>
+<span class="sd">    @param p_instance: a libvlc instance.</span>
+<span class="sd">    @param psz_name: name of vlm media instance.</span>
+<span class="sd">    @param i_instance: instance id.</span>
+<span class="sd">    @return: length of media item or -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_length&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_length&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_rate</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get vlm_media instance playback rate by name or instance id.</span>
+<span class="sd">    @param p_instance: a libvlc instance.</span>
+<span class="sd">    @param psz_name: name of vlm media instance.</span>
+<span class="sd">    @param i_instance: instance id.</span>
+<span class="sd">    @return: playback rate or -1 on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_rate&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_rate&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_title</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get vlm_media instance title number by name or instance id.</span>
+<span class="sd">    @param p_instance: a libvlc instance.</span>
+<span class="sd">    @param psz_name: name of vlm media instance.</span>
+<span class="sd">    @param i_instance: instance id.</span>
+<span class="sd">    @return: title as number or -1 on error.</span>
+<span class="sd">    @bug: will always return 0.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_title&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_title&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_chapter</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get vlm_media instance chapter number by name or instance id.</span>
+<span class="sd">    @param p_instance: a libvlc instance.</span>
+<span class="sd">    @param psz_name: name of vlm media instance.</span>
+<span class="sd">    @param i_instance: instance id.</span>
+<span class="sd">    @return: chapter as number or -1 on error.</span>
+<span class="sd">    @bug: will always return 0.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_chapter&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_chapter&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_seekable</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Is libvlc instance seekable ?</span>
+<span class="sd">    @param p_instance: a libvlc instance.</span>
+<span class="sd">    @param psz_name: name of vlm media instance.</span>
+<span class="sd">    @param i_instance: instance id.</span>
+<span class="sd">    @return: 1 if seekable, 0 if not, -1 if media does not exist.</span>
+<span class="sd">    @bug: will always return 0.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_seekable&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_seekable&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_vlm_get_event_manager</span><span class="p">(</span><span class="n">p_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get libvlc_event_manager from a vlm media.</span>
+<span class="sd">    The p_event_manager is immutable, so you don&#39;t have to hold the lock.</span>
+<span class="sd">    @param p_instance: a libvlc instance.</span>
+<span class="sd">    @return: libvlc_event_manager.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_event_manager&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_event_manager&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">EventManager</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_media_new_location</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_mrl</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Create a media with a certain given media resource location,</span>
+<span class="sd">    for instance a valid URL.</span>
+<span class="sd">    @note: To refer to a local file with this function,</span>
+<span class="sd">    the file://... URI syntax B{must} be used (see IETF RFC3986).</span>
+<span class="sd">    We recommend using L{libvlc_media_new_path}() instead when dealing with</span>
+<span class="sd">    local files.</span>
+<span class="sd">    See L{libvlc_media_release}.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_mrl: the media location.</span>
+<span class="sd">    @return: the newly created media or None on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_location&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_location&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">Media</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_mrl</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_media_new_path</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">path</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Create a media for a certain file path.</span>
+<span class="sd">    See L{libvlc_media_release}.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param path: local filesystem path.</span>
+<span class="sd">    @return: the newly created media or None on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_path&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_path&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">Media</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">path</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_media_new_fd</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">fd</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Create a media for an already open file descriptor.</span>
+<span class="sd">    The file descriptor shall be open for reading (or reading and writing).</span>
+<span class="sd">    Regular file descriptors, pipe read descriptors and character device</span>
+<span class="sd">    descriptors (including TTYs) are supported on all platforms.</span>
+<span class="sd">    Block device descriptors are supported where available.</span>
+<span class="sd">    Directory descriptors are supported on systems that provide fdopendir().</span>
+<span class="sd">    Sockets are supported on all platforms where they are file descriptors,</span>
+<span class="sd">    i.e. all except Windows.</span>
+<span class="sd">    @note: This library will B{not} automatically close the file descriptor</span>
+<span class="sd">    under any circumstance. Nevertheless, a file descriptor can usually only be</span>
+<span class="sd">    rendered once in a media player. To render it a second time, the file</span>
+<span class="sd">    descriptor should probably be rewound to the beginning with lseek().</span>
+<span class="sd">    See L{libvlc_media_release}.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param fd: open file descriptor.</span>
+<span class="sd">    @return: the newly created media or None on error.</span>
+<span class="sd">    @version: LibVLC 1.1.5 and later.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_fd&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_fd&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">Media</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">fd</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_media_new_as_node</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Create a media as an empty node with a given name.</span>
+<span class="sd">    See L{libvlc_media_release}.</span>
+<span class="sd">    @param p_instance: the instance.</span>
+<span class="sd">    @param psz_name: the name of the node.</span>
+<span class="sd">    @return: the new empty media or None on error.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_as_node&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_new_as_node&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">Media</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_media_add_option</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">psz_options</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Add an option to the media.</span>
+<span class="sd">    This option will be used to determine how the media_player will</span>
+<span class="sd">    read the media. This allows to use VLC&#39;s advanced</span>
+<span class="sd">    reading/streaming options on a per-media basis.</span>
+<span class="sd">    @note: The options are listed in &#39;vlc --long-help&#39; from the command line,</span>
+<span class="sd">    e.g. &quot;-sout-all&quot;. Keep in mind that available options and their semantics</span>
+<span class="sd">    vary across LibVLC versions and builds.</span>
+<span class="sd">    @warning: Not all options affects L{Media} objects:</span>
+<span class="sd">    Specifically, due to architectural issues most audio and video options,</span>
+<span class="sd">    such as text renderer options, have no effects on an individual media.</span>
+<span class="sd">    These options must be set through L{libvlc_new}() instead.</span>
+<span class="sd">    @param p_md: the media descriptor.</span>
+<span class="sd">    @param psz_options: the options (as a string).</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_add_option&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_add_option&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">Media</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">psz_options</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_media_add_option_flag</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">psz_options</span><span class="p">,</span> <span class="n">i_flags</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Add an option to the media with configurable flags.</span>
+<span class="sd">    This option will be used to determine how the media_player will</span>
+<span class="sd">    read the media. This allows to use VLC&#39;s advanced</span>
+<span class="sd">    reading/streaming options on a per-media basis.</span>
+<span class="sd">    The options are detailed in vlc --long-help, for instance</span>
+<span class="sd">    &quot;--sout-all&quot;. Note that all options are not usable on medias:</span>
+<span class="sd">    specifically, due to architectural issues, video-related options</span>
+<span class="sd">    such as text renderer options cannot be set on a single media. They</span>
+<span class="sd">    must be set on the whole libvlc instance instead.</span>
+<span class="sd">    @param p_md: the media descriptor.</span>
+<span class="sd">    @param psz_options: the options (as a string).</span>
+<span class="sd">    @param i_flags: the flags for this option.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_add_option_flag&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_add_option_flag&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">Media</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">psz_options</span><span class="p">,</span> <span class="n">i_flags</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_media_retain</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Retain a reference to a media descriptor object (libvlc_media_t). Use</span>
+<span class="sd">    L{libvlc_media_release}() to decrement the reference count of a</span>
+<span class="sd">    media descriptor object.</span>
+<span class="sd">    @param p_md: the media descriptor.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_retain&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_retain&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_media_release</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Decrement the reference count of a media descriptor object. If the</span>
+<span class="sd">    reference count is 0, then L{libvlc_media_release}() will release the</span>
+<span class="sd">    media descriptor object. It will send out an libvlc_MediaFreed event</span>
+<span class="sd">    to all listeners. If the media descriptor object has been released it</span>
+<span class="sd">    should not be used again.</span>
+<span class="sd">    @param p_md: the media descriptor.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_media_get_mrl</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get the media resource locator (mrl) from a media descriptor object.</span>
+<span class="sd">    @param p_md: a media descriptor object.</span>
+<span class="sd">    @return: string with mrl of media descriptor object.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_mrl&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_mrl&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">string_result</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_media_duplicate</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Duplicate a media descriptor object.</span>
+<span class="sd">    @param p_md: a media descriptor object.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_duplicate&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_duplicate&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">Media</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_media_get_meta</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">e_meta</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Read the meta of the media.</span>
+<span class="sd">    If the media has not yet been parsed this will return None.</span>
+<span class="sd">    This methods automatically calls L{libvlc_media_parse_async}(), so after calling</span>
+<span class="sd">    it you may receive a libvlc_MediaMetaChanged event. If you prefer a synchronous</span>
 <span class="sd">    version ensure that you call L{libvlc_media_parse}() before get_meta().</span>
 <span class="sd">    See L{libvlc_media_parse}</span>
 <span class="sd">    See L{libvlc_media_parse_async}</span>
@@ -4572,11 +4959,11 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 
 <span class="k">def</span> <span class="nf">libvlc_media_parse</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Parse a media.</span>
-<span class="sd">    This fetches (local) art, meta data and tracks information.</span>
+<span class="sd">    This fetches (local) meta data and tracks information.</span>
 <span class="sd">    The method is synchronous.</span>
 <span class="sd">    See L{libvlc_media_parse_async}</span>
 <span class="sd">    See L{libvlc_media_get_meta}</span>
-<span class="sd">    See libvlc_media_get_tracks_info.</span>
+<span class="sd">    See L{libvlc_media_get_tracks_info}.</span>
 <span class="sd">    @param p_md: media descriptor object.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_parse&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
@@ -4586,7 +4973,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 
 <span class="k">def</span> <span class="nf">libvlc_media_parse_async</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Parse a media.</span>
-<span class="sd">    This fetches (local) art, meta data and tracks information.</span>
+<span class="sd">    This fetches (local) meta data and tracks information.</span>
 <span class="sd">    The method is the asynchronous of L{libvlc_media_parse}().</span>
 <span class="sd">    To track when this is over you can listen to libvlc_MediaParsedChanged</span>
 <span class="sd">    event. However if the media was already parsed you will not receive this</span>
@@ -4594,7 +4981,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">    See L{libvlc_media_parse}</span>
 <span class="sd">    See libvlc_MediaParsedChanged</span>
 <span class="sd">    See L{libvlc_media_get_meta}</span>
-<span class="sd">    See libvlc_media_get_tracks_info.</span>
+<span class="sd">    See L{libvlc_media_get_tracks_info}.</span>
 <span class="sd">    @param p_md: media descriptor object.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_parse_async&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
@@ -4602,30 +4989,6 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
                     <span class="kc">None</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
     <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_parse_with_options</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">parse_flag</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Parse the media asynchronously with options.</span>
-<span class="sd">    This fetches (local or network) art, meta data and/or tracks information.</span>
-<span class="sd">    This method is the extended version of L{libvlc_media_parse_async}().</span>
-<span class="sd">    To track when this is over you can listen to libvlc_MediaParsedChanged</span>
-<span class="sd">    event. However if this functions returns an error, you will not receive this</span>
-<span class="sd">    event.</span>
-<span class="sd">    It uses a flag to specify parse options (see libvlc_media_parse_flag_t). All</span>
-<span class="sd">    these flags can be combined. By default, media is parsed if it&#39;s a local</span>
-<span class="sd">    file.</span>
-<span class="sd">    See libvlc_MediaParsedChanged</span>
-<span class="sd">    See L{libvlc_media_get_meta}</span>
-<span class="sd">    See L{libvlc_media_tracks_get}</span>
-<span class="sd">    See libvlc_media_parse_flag_t.</span>
-<span class="sd">    @param p_md: media descriptor object.</span>
-<span class="sd">    @param parse_flag: parse options:</span>
-<span class="sd">    @return: -1 in case of error, 0 otherwise.</span>
-<span class="sd">    @version: LibVLC 3.0.0 or later.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_parse_with_options&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_parse_with_options&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Media</span><span class="p">,</span> <span class="n">MediaParseFlag</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">parse_flag</span><span class="p">)</span>
-
 <span class="k">def</span> <span class="nf">libvlc_media_is_parsed</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Get Parsed status for media descriptor object.</span>
 <span class="sd">    See libvlc_MediaParsedChanged.</span>
@@ -4633,229 +4996,73 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">    @return: true if media object has been parsed otherwise it returns false \libvlc_return_bool.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_is_parsed&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_is_parsed&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_set_user_data</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">p_new_user_data</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Sets media descriptor&#39;s user_data. user_data is specialized data</span>
-<span class="sd">    accessed by the host application, VLC.framework uses it as a pointer to</span>
-<span class="sd">    an native object that references a L{Media} pointer.</span>
-<span class="sd">    @param p_md: media descriptor object.</span>
-<span class="sd">    @param p_new_user_data: pointer to user data.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_set_user_data&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_set_user_data&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">Media</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">p_new_user_data</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_get_user_data</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get media descriptor&#39;s user_data. user_data is specialized data</span>
-<span class="sd">    accessed by the host application, VLC.framework uses it as a pointer to</span>
-<span class="sd">    an native object that references a L{Media} pointer.</span>
-<span class="sd">    @param p_md: media descriptor object.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_user_data&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_user_data&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_tracks_get</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">tracks</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get media descriptor&#39;s elementary streams description</span>
-<span class="sd">    Note, you need to call L{libvlc_media_parse}() or play the media at least once</span>
-<span class="sd">    before calling this function.</span>
-<span class="sd">    Not doing this will result in an empty array.</span>
-<span class="sd">    @param p_md: media descriptor object.</span>
-<span class="sd">    @param tracks: address to store an allocated array of Elementary Streams descriptions (must be freed with L{libvlc_media_tracks_release}.</span>
-<span class="sd">    @return: the number of Elementary Streams (zero on error).</span>
-<span class="sd">    @version: LibVLC 2.1.0 and later.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_tracks_get&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_tracks_get&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">,</span> <span class="n">Media</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">MediaTrack</span><span class="p">)))</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">tracks</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_get_codec_description</span><span class="p">(</span><span class="n">i_type</span><span class="p">,</span> <span class="n">i_codec</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get codec description from media elementary stream.</span>
-<span class="sd">    @param i_type: i_type from L{MediaTrack}.</span>
-<span class="sd">    @param i_codec: i_codec or i_original_fourcc from L{MediaTrack}.</span>
-<span class="sd">    @return: codec description.</span>
-<span class="sd">    @version: LibVLC 3.0.0 and later. See L{MediaTrack}.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_codec_description&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_codec_description&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">TrackType</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint32</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">i_type</span><span class="p">,</span> <span class="n">i_codec</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_tracks_release</span><span class="p">(</span><span class="n">p_tracks</span><span class="p">,</span> <span class="n">i_count</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Release media descriptor&#39;s elementary streams description array.</span>
-<span class="sd">    @param p_tracks: tracks info array to release.</span>
-<span class="sd">    @param i_count: number of elements in the array.</span>
-<span class="sd">    @version: LibVLC 2.1.0 and later.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_tracks_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_tracks_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">MediaTrack</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_tracks</span><span class="p">,</span> <span class="n">i_count</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_get_type</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get the media type of the media descriptor object.</span>
-<span class="sd">    @param p_md: media descriptor object.</span>
-<span class="sd">    @return: media type.</span>
-<span class="sd">    @version: LibVLC 3.0.0 and later. See libvlc_media_type_t.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_type&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_type&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">MediaType</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_discoverer_new</span><span class="p">(</span><span class="n">p_inst</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Create a media discoverer object by name.</span>
-<span class="sd">    After this object is created, you should attach to events in order to be</span>
-<span class="sd">    notified of the discoverer state.</span>
-<span class="sd">    You should also attach to media_list events in order to be notified of new</span>
-<span class="sd">    items discovered.</span>
-<span class="sd">    You need to call L{libvlc_media_discoverer_start}() in order to start the</span>
-<span class="sd">    discovery.</span>
-<span class="sd">    See L{libvlc_media_discoverer_media_list}</span>
-<span class="sd">    See L{libvlc_media_discoverer_event_manager}</span>
-<span class="sd">    See L{libvlc_media_discoverer_start}.</span>
-<span class="sd">    @param p_inst: libvlc instance.</span>
-<span class="sd">    @param psz_name: service name.</span>
-<span class="sd">    @return: media discover object or None in case of error.</span>
-<span class="sd">    @version: LibVLC 3.0.0 or later.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_new&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_new&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">MediaDiscoverer</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_inst</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_discoverer_start</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Start media discovery.</span>
-<span class="sd">    To stop it, call L{libvlc_media_discoverer_stop}() or</span>
-<span class="sd">    L{libvlc_media_discoverer_release}() directly.</span>
-<span class="sd">    See L{libvlc_media_discoverer_stop}.</span>
-<span class="sd">    @param p_mdis: media discover object.</span>
-<span class="sd">    @return: -1 in case of error, 0 otherwise.</span>
-<span class="sd">    @version: LibVLC 3.0.0 or later.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_start&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_start&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaDiscoverer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_discoverer_stop</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Stop media discovery.</span>
-<span class="sd">    See L{libvlc_media_discoverer_start}.</span>
-<span class="sd">    @param p_mdis: media discover object.</span>
-<span class="sd">    @version: LibVLC 3.0.0 or later.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_stop&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_stop&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaDiscoverer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_discoverer_release</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Release media discover object. If the reference count reaches 0, then</span>
-<span class="sd">    the object will be released.</span>
-<span class="sd">    @param p_mdis: media service discover object.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaDiscoverer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_discoverer_localized_name</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get media service discover object its localized name.</span>
-<span class="sd">    @param p_mdis: media discover object.</span>
-<span class="sd">    @return: localized name.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_localized_name&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_localized_name&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">string_result</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaDiscoverer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_discoverer_media_list</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get media service discover media list.</span>
-<span class="sd">    @param p_mdis: media service discover object.</span>
-<span class="sd">    @return: list of media items.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_media_list&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_media_list&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">MediaList</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaDiscoverer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_discoverer_event_manager</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get event manager from media service discover object.</span>
-<span class="sd">    @param p_mdis: media service discover object.</span>
-<span class="sd">    @return: event manager object.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_event_manager&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_event_manager&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">EventManager</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaDiscoverer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_discoverer_is_running</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Query if media service discover object is running.</span>
-<span class="sd">    @param p_mdis: media service discover object.</span>
-<span class="sd">    @return: true if running, false if not \libvlc_return_bool.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_is_running&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_discoverer_is_running&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaDiscoverer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mdis</span><span class="p">)</span>
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_is_parsed&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_library_new</span><span class="p">(</span><span class="n">p_instance</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Create an new Media Library object.</span>
-<span class="sd">    @param p_instance: the libvlc instance.</span>
-<span class="sd">    @return: a new object or None on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_set_user_data</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">p_new_user_data</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Sets media descriptor&#39;s user_data. user_data is specialized data</span>
+<span class="sd">    accessed by the host application, VLC.framework uses it as a pointer to</span>
+<span class="sd">    an native object that references a L{Media} pointer.</span>
+<span class="sd">    @param p_md: media descriptor object.</span>
+<span class="sd">    @param p_new_user_data: pointer to user data.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_new&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_new&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">MediaLibrary</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_set_user_data&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_set_user_data&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">Media</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">p_new_user_data</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_library_release</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Release media library object. This functions decrements the</span>
-<span class="sd">    reference count of the media library object. If it reaches 0,</span>
-<span class="sd">    then the object will be released.</span>
-<span class="sd">    @param p_mlib: media library object.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_get_user_data</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get media descriptor&#39;s user_data. user_data is specialized data</span>
+<span class="sd">    accessed by the host application, VLC.framework uses it as a pointer to</span>
+<span class="sd">    an native object that references a L{Media} pointer.</span>
+<span class="sd">    @param p_md: media descriptor object.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaLibrary</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_user_data&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_user_data&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_library_retain</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Retain a reference to a media library object. This function will</span>
-<span class="sd">    increment the reference counting for this object. Use</span>
-<span class="sd">    L{libvlc_media_library_release}() to decrement the reference count.</span>
-<span class="sd">    @param p_mlib: media library object.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_get_tracks_info</span><span class="p">(</span><span class="n">p_md</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get media descriptor&#39;s elementary streams description</span>
+<span class="sd">    Note, you need to call L{libvlc_media_parse}() or play the media at least once</span>
+<span class="sd">    before calling this function.</span>
+<span class="sd">    Not doing this will result in an empty array.</span>
+<span class="sd">    \deprecated Use L{libvlc_media_tracks_get} instead.</span>
+<span class="sd">    @param p_md: media descriptor object.</span>
+<span class="sd">    @param tracks: address to store an allocated array of Elementary Streams descriptions (must be freed by the caller) [OUT].</span>
+<span class="sd">    @return: the number of Elementary Streams.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_retain&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_retain&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaLibrary</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_tracks_info&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_get_tracks_info&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">2</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Media</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">))</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_library_load</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Load media library.</span>
-<span class="sd">    @param p_mlib: media library object.</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_tracks_get</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">tracks</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get media descriptor&#39;s elementary streams description</span>
+<span class="sd">    Note, you need to call L{libvlc_media_parse}() or play the media at least once</span>
+<span class="sd">    before calling this function.</span>
+<span class="sd">    Not doing this will result in an empty array.</span>
+<span class="sd">    @param p_md: media descriptor object.</span>
+<span class="sd">    @param tracks: address to store an allocated array of Elementary Streams descriptions (must be freed with L{libvlc_media_tracks_release}.</span>
+<span class="sd">    @return: the number of Elementary Streams (zero on error).</span>
+<span class="sd">    @version: LibVLC 2.1.0 and later.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_load&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_load&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaLibrary</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_tracks_get&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_tracks_get&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">,</span> <span class="n">Media</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">MediaTrack</span><span class="p">)))</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_md</span><span class="p">,</span> <span class="n">tracks</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_library_media_list</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get media library subitems.</span>
-<span class="sd">    @param p_mlib: media library object.</span>
-<span class="sd">    @return: media list subitems.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_tracks_release</span><span class="p">(</span><span class="n">p_tracks</span><span class="p">,</span> <span class="n">i_count</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Release media descriptor&#39;s elementary streams description array.</span>
+<span class="sd">    @param p_tracks: tracks info array to release.</span>
+<span class="sd">    @param i_count: number of elements in the array.</span>
+<span class="sd">    @version: LibVLC 2.1.0 and later.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_media_list&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_library_media_list&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">MediaList</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaLibrary</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlib</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_tracks_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_tracks_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">MediaTrack</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_tracks</span><span class="p">,</span> <span class="n">i_count</span><span class="p">)</span>
 
 <span class="k">def</span> <span class="nf">libvlc_media_list_new</span><span class="p">(</span><span class="n">p_instance</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Create an empty media list.</span>
@@ -4980,219 +5187,61 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
     <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_index_of_item&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
         <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_index_of_item&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
                     <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaList</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_ml</span><span class="p">,</span> <span class="n">p_md</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_is_readonly</span><span class="p">(</span><span class="n">p_ml</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;This indicates if this media list is read-only from a user point of view.</span>
-<span class="sd">    @param p_ml: media list instance.</span>
-<span class="sd">    @return: 1 on readonly, 0 on readwrite \libvlc_return_bool.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_is_readonly&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_is_readonly&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaList</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_ml</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_lock</span><span class="p">(</span><span class="n">p_ml</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get lock on media list items.</span>
-<span class="sd">    @param p_ml: a media list instance.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_lock&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_lock&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaList</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_ml</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_unlock</span><span class="p">(</span><span class="n">p_ml</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Release lock on media list items</span>
-<span class="sd">    The L{libvlc_media_list_lock} should be held upon entering this function.</span>
-<span class="sd">    @param p_ml: a media list instance.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_unlock&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_unlock&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaList</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_ml</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_event_manager</span><span class="p">(</span><span class="n">p_ml</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get libvlc_event_manager from this media list instance.</span>
-<span class="sd">    The p_event_manager is immutable, so you don&#39;t have to hold the lock.</span>
-<span class="sd">    @param p_ml: a media list instance.</span>
-<span class="sd">    @return: libvlc_event_manager.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_event_manager&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_event_manager&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">EventManager</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaList</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_ml</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_new</span><span class="p">(</span><span class="n">p_instance</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Create new media_list_player.</span>
-<span class="sd">    @param p_instance: libvlc instance.</span>
-<span class="sd">    @return: media list player instance or None on error.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_new&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_new&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">MediaListPlayer</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_release</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Release a media_list_player after use</span>
-<span class="sd">    Decrement the reference count of a media player object. If the</span>
-<span class="sd">    reference count is 0, then L{libvlc_media_list_player_release}() will</span>
-<span class="sd">    release the media player object. If the media player object</span>
-<span class="sd">    has been released, then it should not be used again.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_retain</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Retain a reference to a media player list object. Use</span>
-<span class="sd">    L{libvlc_media_list_player_release}() to decrement reference count.</span>
-<span class="sd">    @param p_mlp: media player list object.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_retain&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_retain&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_event_manager</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Return the event manager of this media_list_player.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    @return: the event manager.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_event_manager&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_event_manager&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">EventManager</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_set_media_player</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">p_mi</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Replace media player in media_list_player with this instance.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    @param p_mi: media player instance.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_set_media_player&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_set_media_player&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">p_mi</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_get_media_player</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get media player of the media_list_player instance.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    @return: media player instance @note the caller is responsible for releasing the returned instance.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_get_media_player&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_get_media_player&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">MediaPlayer</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_set_media_list</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">p_mlist</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Set the media list associated with the player.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    @param p_mlist: list of media.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_set_media_list&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_set_media_list&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">,</span> <span class="n">MediaList</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">p_mlist</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_play</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Play media list.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_play&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_play&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_pause</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Toggle pause (or resume) media list.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_pause&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_pause&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_is_playing</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Is media list playing?</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    @return: true for playing and false for not playing \libvlc_return_bool.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_is_playing&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_is_playing&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_get_state</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get current libvlc_state of media list player.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    @return: libvlc_state_t for media list player.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_get_state&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_get_state&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">State</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_play_item_at_index</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">i_index</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Play media list item at position index.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    @param i_index: index in media list to play.</span>
-<span class="sd">    @return: 0 upon success -1 if the item wasn&#39;t found.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_play_item_at_index&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_play_item_at_index&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">i_index</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_play_item</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">p_md</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Play the given media item.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    @param p_md: the media instance.</span>
-<span class="sd">    @return: 0 upon success, -1 if the media is not part of the media list.</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_ml</span><span class="p">,</span> <span class="n">p_md</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_media_list_is_readonly</span><span class="p">(</span><span class="n">p_ml</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;This indicates if this media list is read-only from a user point of view.</span>
+<span class="sd">    @param p_ml: media list instance.</span>
+<span class="sd">    @return: 1 on readonly, 0 on readwrite \libvlc_return_bool.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_play_item&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_play_item&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">p_md</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_is_readonly&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_is_readonly&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaList</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_ml</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_stop</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Stop playing media list.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_lock</span><span class="p">(</span><span class="n">p_ml</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get lock on media list items.</span>
+<span class="sd">    @param p_ml: a media list instance.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_stop&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_stop&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_lock&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_lock&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaList</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_ml</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_next</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Play next item from media list.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    @return: 0 upon success -1 if there is no next item.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_unlock</span><span class="p">(</span><span class="n">p_ml</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Release lock on media list items</span>
+<span class="sd">    The L{libvlc_media_list_lock} should be held upon entering this function.</span>
+<span class="sd">    @param p_ml: a media list instance.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_next&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_next&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_unlock&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_unlock&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaList</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_ml</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_previous</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Play previous item from media list.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    @return: 0 upon success -1 if there is no previous item.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_event_manager</span><span class="p">(</span><span class="n">p_ml</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get libvlc_event_manager from this media list instance.</span>
+<span class="sd">    The p_event_manager is immutable, so you don&#39;t have to hold the lock.</span>
+<span class="sd">    @param p_ml: a media list instance.</span>
+<span class="sd">    @return: libvlc_event_manager.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_previous&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_previous&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_event_manager&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_event_manager&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">EventManager</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaList</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_ml</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_list_player_set_playback_mode</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">e_mode</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Sets the playback mode for the playlist.</span>
-<span class="sd">    @param p_mlp: media list player instance.</span>
-<span class="sd">    @param e_mode: playback mode specification.</span>
+<span class="k">def</span> <span class="nf">libvlc_playlist_play</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">i_id</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Start playing (if there is any item in the playlist).</span>
+<span class="sd">    Additionnal playlist item options can be specified for addition to the</span>
+<span class="sd">    item before it is played.</span>
+<span class="sd">    @param p_instance: the playlist instance.</span>
+<span class="sd">    @param i_id: the item to play. If this is a negative number, the next item will be selected. Otherwise, the item with the given ID will be played.</span>
+<span class="sd">    @param i_options: the number of options to add to the item.</span>
+<span class="sd">    @param ppsz_options: the options to add to the item.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_set_playback_mode&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_set_playback_mode&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">,</span> <span class="n">PlaybackMode</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">e_mode</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_playlist_play&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_playlist_play&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ListPOINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">))</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">i_id</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">)</span>
 
 <span class="k">def</span> <span class="nf">libvlc_media_player_new</span><span class="p">(</span><span class="n">p_libvlc_instance</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Create an empty Media Player object.</span>
@@ -5369,7 +5418,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">    Use the vout called &quot;macosx&quot;.</span>
 <span class="sd">    The drawable is an NSObject that follow the VLCOpenGLVideoViewEmbedding</span>
 <span class="sd">    protocol:</span>
-<span class="sd">    @code.m</span>
+<span class="sd">    @begincode</span>
 <span class="sd">    \@protocol VLCOpenGLVideoViewEmbedding &lt;NSObject&gt;</span>
 <span class="sd">    - (void)addVoutSubview:(NSView *)view;</span>
 <span class="sd">    - (void)removeVoutSubview:(NSView *)view;</span>
@@ -5378,7 +5427,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">    Or it can be an NSView object.</span>
 <span class="sd">    If you want to use it along with Qt4 see the QMacCocoaViewContainer. Then</span>
 <span class="sd">    the following code should work:</span>
-<span class="sd">    @code.mm</span>
+<span class="sd">    @begincode</span>
 <span class="sd">    </span>
 <span class="sd">        NSView *video = [[NSView alloc] init];</span>
 <span class="sd">        QMacCocoaViewContainer *container = new QMacCocoaViewContainer(video, parent);</span>
@@ -5406,7 +5455,9 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
     <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">)</span>
 
 <span class="k">def</span> <span class="nf">libvlc_media_player_set_agl</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">drawable</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;\deprecated Use L{libvlc_media_player_set_nsobject} instead.</span>
+    <span class="sd">&#39;&#39;&#39;Set the agl handler where the media player should render its video output.</span>
+<span class="sd">    @param p_mi: the Media Player.</span>
+<span class="sd">    @param drawable: the agl handler.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_player_set_agl&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
         <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_player_set_agl&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
@@ -5414,7 +5465,9 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
     <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">drawable</span><span class="p">)</span>
 
 <span class="k">def</span> <span class="nf">libvlc_media_player_get_agl</span><span class="p">(</span><span class="n">p_mi</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;\deprecated Use L{libvlc_media_player_get_nsobject} instead.</span>
+    <span class="sd">&#39;&#39;&#39;Get the agl handler previously set with L{libvlc_media_player_set_agl}().</span>
+<span class="sd">    @param p_mi: the Media Player.</span>
+<span class="sd">    @return: the agl handler or 0 if none where set.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_player_get_agl&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
         <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_player_get_agl&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
@@ -5423,24 +5476,15 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 
 <span class="k">def</span> <span class="nf">libvlc_media_player_set_xwindow</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">drawable</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Set an X Window System drawable where the media player should render its</span>
-<span class="sd">    video output. The call takes effect when the playback starts. If it is</span>
-<span class="sd">    already started, it might need to be stopped before changes apply.</span>
-<span class="sd">    If LibVLC was built without X11 output support, then this function has no</span>
-<span class="sd">    effects.</span>
-<span class="sd">    By default, LibVLC will capture input events on the video rendering area.</span>
-<span class="sd">    Use L{libvlc_video_set_mouse_input}() and L{libvlc_video_set_key_input}() to</span>
-<span class="sd">    disable that and deliver events to the parent window / to the application</span>
-<span class="sd">    instead. By design, the X11 protocol delivers input events to only one</span>
-<span class="sd">    recipient.</span>
-<span class="sd">    @warning</span>
-<span class="sd">    The application must call the XInitThreads() function from Xlib before</span>
-<span class="sd">    L{libvlc_new}(), and before any call to XOpenDisplay() directly or via any</span>
-<span class="sd">    other library. Failure to call XInitThreads() will seriously impede LibVLC</span>
-<span class="sd">    performance. Calling XOpenDisplay() before XInitThreads() will eventually</span>
-<span class="sd">    crash the process. That is a limitation of Xlib.</span>
-<span class="sd">    @param p_mi: media player.</span>
-<span class="sd">    @param drawable: X11 window ID @note The specified identifier must correspond to an existing Input/Output class X11 window. Pixmaps are B{not} currently supported. The default X11 server is assumed, i.e. that specified in the DISPLAY environment variable. @warning LibVLC can deal with invalid X11 handle errors, however some display drivers (EGL, GLX, VA and/or VDPAU) can unfortunately not. Thus the window handle must remain valid until playback is stopped, otherwise the process may abort or crash.</span>
-<span class="sd">    @bug No more than one window handle per media player instance can be specified. If the media has multiple simultaneously active video tracks, extra tracks will be rendered into external windows beyond the control of the application.</span>
+<span class="sd">    video output. If LibVLC was built without X11 output support, then this has</span>
+<span class="sd">    no effects.</span>
+<span class="sd">    The specified identifier must correspond to an existing Input/Output class</span>
+<span class="sd">    X11 window. Pixmaps are B{not} supported. The caller shall ensure that</span>
+<span class="sd">    the X11 server is the same as the one the VLC instance has been configured</span>
+<span class="sd">    with. This function must be called before video playback is started;</span>
+<span class="sd">    otherwise it will only take effect after playback stop and restart.</span>
+<span class="sd">    @param p_mi: the Media Player.</span>
+<span class="sd">    @param drawable: the ID of the X window.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_player_set_xwindow&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
         <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_player_set_xwindow&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
@@ -5484,18 +5528,6 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
                     <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">)</span>
     <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_player_set_android_context</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">p_jvm</span><span class="p">,</span> <span class="n">p_awindow_handler</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Set the android context.</span>
-<span class="sd">    @param p_mi: the media player.</span>
-<span class="sd">    @param p_jvm: the Java VM of the android process.</span>
-<span class="sd">    @param awindow_handler: org.videolan.libvlc.IAWindowNativeHandler jobject implemented by the org.videolan.libvlc.MediaPlayer class from the libvlc-android project.</span>
-<span class="sd">    @version: LibVLC 3.0.0 and later.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_player_set_android_context&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_player_set_android_context&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">p_jvm</span><span class="p">,</span> <span class="n">p_awindow_handler</span><span class="p">)</span>
-
 <span class="k">def</span> <span class="nf">libvlc_audio_set_callbacks</span><span class="p">(</span><span class="n">mp</span><span class="p">,</span> <span class="n">play</span><span class="p">,</span> <span class="n">pause</span><span class="p">,</span> <span class="n">resume</span><span class="p">,</span> <span class="n">flush</span><span class="p">,</span> <span class="n">drain</span><span class="p">,</span> <span class="n">opaque</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Set callbacks and private data for decoded audio.</span>
 <span class="sd">    Use L{libvlc_audio_set_format}() or L{libvlc_audio_set_format_callbacks}()</span>
@@ -5833,6 +5865,14 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
                     <span class="kc">None</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">TrackDescription</span><span class="p">))</span>
     <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_track_description</span><span class="p">)</span>
 
+<span class="k">def</span> <span class="nf">libvlc_track_description_release</span><span class="p">(</span><span class="n">p_track_description</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;\deprecated Use L{libvlc_track_description_list_release} instead.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_track_description_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_track_description_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">TrackDescription</span><span class="p">))</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_track_description</span><span class="p">)</span>
+
 <span class="k">def</span> <span class="nf">libvlc_toggle_fullscreen</span><span class="p">(</span><span class="n">p_mi</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Toggle fullscreen status on non-embedded video outputs.</span>
 <span class="sd">    @warning: The same limitations applies to this function</span>
@@ -5912,6 +5952,28 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
                     <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">))</span>
     <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">num</span><span class="p">)</span>
 
+<span class="k">def</span> <span class="nf">libvlc_video_get_height</span><span class="p">(</span><span class="n">p_mi</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get current video height.</span>
+<span class="sd">    \deprecated Use L{libvlc_video_get_size}() instead.</span>
+<span class="sd">    @param p_mi: the media player.</span>
+<span class="sd">    @return: the video pixel height or 0 if not applicable.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_video_get_height&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_video_get_height&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_video_get_width</span><span class="p">(</span><span class="n">p_mi</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get current video width.</span>
+<span class="sd">    \deprecated Use L{libvlc_video_get_size}() instead.</span>
+<span class="sd">    @param p_mi: the media player.</span>
+<span class="sd">    @return: the video pixel width or 0 if not applicable.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_video_get_width&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_video_get_width&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">)</span>
+
 <span class="k">def</span> <span class="nf">libvlc_video_get_cursor</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">num</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Get the mouse pointer coordinates over a video.</span>
 <span class="sd">    Coordinates are expressed in terms of the decoded video resolution,</span>
@@ -6001,7 +6063,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="k">def</span> <span class="nf">libvlc_video_get_spu_description</span><span class="p">(</span><span class="n">p_mi</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Get the description of available video subtitles.</span>
 <span class="sd">    @param p_mi: the media player.</span>
-<span class="sd">    @return: list containing description of available video subtitles. It must be freed with L{libvlc_track_description_list_release}().</span>
+<span class="sd">    @return: list containing description of available video subtitles.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_video_get_spu_description&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
         <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_video_get_spu_description&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
@@ -6057,52 +6119,26 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
                     <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int64</span><span class="p">)</span>
     <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">i_delay</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_media_player_get_full_title_descriptions</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">titles</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get the full description of available titles.</span>
+<span class="k">def</span> <span class="nf">libvlc_video_get_title_description</span><span class="p">(</span><span class="n">p_mi</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get the description of available titles.</span>
 <span class="sd">    @param p_mi: the media player.</span>
-<span class="sd">    @param address: to store an allocated array of title descriptions descriptions (must be freed with L{libvlc_title_descriptions_release}() by the caller) [OUT].</span>
-<span class="sd">    @return: the number of titles (-1 on error).</span>
-<span class="sd">    @version: LibVLC 3.0.0 and later.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_player_get_full_title_descriptions&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_player_get_full_title_descriptions&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">TitleDescription</span><span class="p">)))</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">titles</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_title_descriptions_release</span><span class="p">(</span><span class="n">p_titles</span><span class="p">,</span> <span class="n">i_count</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Release a title description.</span>
-<span class="sd">    @param title: description array to release.</span>
-<span class="sd">    @param number: of title descriptions to release.</span>
-<span class="sd">    @version: LibVLC 3.0.0 and later.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_title_descriptions_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_title_descriptions_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">TitleDescription</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_titles</span><span class="p">,</span> <span class="n">i_count</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_media_player_get_full_chapter_descriptions</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">i_chapters_of_title</span><span class="p">,</span> <span class="n">pp_chapters</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get the full description of available chapters.</span>
+<span class="sd">    @return: list containing description of available titles.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_video_get_title_description&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_video_get_title_description&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">TrackDescription</span><span class="p">),</span> <span class="n">MediaPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_video_get_chapter_description</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">i_title</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get the description of available chapters for specific title.</span>
 <span class="sd">    @param p_mi: the media player.</span>
-<span class="sd">    @param index: of the title to query for chapters (uses current title if set to -1).</span>
-<span class="sd">    @param address: to store an allocated array of chapter descriptions descriptions (must be freed with L{libvlc_chapter_descriptions_release}() by the caller) [OUT].</span>
-<span class="sd">    @return: the number of chapters (-1 on error).</span>
-<span class="sd">    @version: LibVLC 3.0.0 and later.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_player_get_full_chapter_descriptions&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_player_get_full_chapter_descriptions&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ChapterDescription</span><span class="p">)))</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">i_chapters_of_title</span><span class="p">,</span> <span class="n">pp_chapters</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_chapter_descriptions_release</span><span class="p">(</span><span class="n">p_chapters</span><span class="p">,</span> <span class="n">i_count</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Release a chapter description.</span>
-<span class="sd">    @param chapter: description array to release.</span>
-<span class="sd">    @param number: of chapter descriptions to release.</span>
-<span class="sd">    @version: LibVLC 3.0.0 and later.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_chapter_descriptions_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_chapter_descriptions_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">ChapterDescription</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_uint</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_chapters</span><span class="p">,</span> <span class="n">i_count</span><span class="p">)</span>
+<span class="sd">    @param i_title: selected title.</span>
+<span class="sd">    @return: list containing description of available chapter for title i_title.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_video_get_chapter_description&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_video_get_chapter_description&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">POINTER</span><span class="p">(</span><span class="n">TrackDescription</span><span class="p">),</span> <span class="n">MediaPlayer</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">i_title</span><span class="p">)</span>
 
 <span class="k">def</span> <span class="nf">libvlc_video_get_crop_geometry</span><span class="p">(</span><span class="n">p_mi</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Get current crop filter geometry.</span>
@@ -6166,7 +6202,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="k">def</span> <span class="nf">libvlc_video_get_track_description</span><span class="p">(</span><span class="n">p_mi</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Get the description of available video tracks.</span>
 <span class="sd">    @param p_mi: media player.</span>
-<span class="sd">    @return: list with description of available video tracks, or None on error. It must be freed with L{libvlc_track_description_list_release}().</span>
+<span class="sd">    @return: list with description of available video tracks, or None on error.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_video_get_track_description&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
         <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_video_get_track_description&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
@@ -6353,7 +6389,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="k">def</span> <span class="nf">libvlc_audio_output_list_get</span><span class="p">(</span><span class="n">p_instance</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Gets the list of available audio output modules.</span>
 <span class="sd">    @param p_instance: libvlc instance.</span>
-<span class="sd">    @return: list of available audio outputs. It must be freed with In case of error, None is returned.</span>
+<span class="sd">    @return: list of available audio outputs. It must be freed it with In case of error, None is returned.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_output_list_get&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
         <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_output_list_get&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
@@ -6382,6 +6418,44 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
                     <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
     <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
 
+<span class="k">def</span> <span class="nf">libvlc_audio_output_device_count</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Backward compatibility stub. Do not use in new code.</span>
+<span class="sd">    Use L{libvlc_audio_output_device_list_get}() instead.</span>
+<span class="sd">    @param p_instance: vlc instance.</span>
+<span class="sd">    @param psz_name: name.</span>
+<span class="sd">    @return: always 0.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_output_device_count&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_output_device_count&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_audio_output_device_longname</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="nb">int</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Backward compatibility stub. Do not use in new code.</span>
+<span class="sd">    Use L{libvlc_audio_output_device_list_get}() instead.</span>
+<span class="sd">    @param p_instance: vlc instance.</span>
+<span class="sd">    @param psz_name: name.</span>
+<span class="sd">    @param int: index.</span>
+<span class="sd">    @return: always None.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_output_device_longname&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_output_device_longname&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">string_result</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="nb">int</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_audio_output_device_id</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="nb">int</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Backward compatibility stub. Do not use in new code.</span>
+<span class="sd">    Use L{libvlc_audio_output_device_list_get}() instead.</span>
+<span class="sd">    @param p_instance: vlc instance.</span>
+<span class="sd">    @param psz_name: name.</span>
+<span class="sd">    @param int: index.</span>
+<span class="sd">    @return: always None.</span>
+<span class="sd">    &#39;&#39;&#39;</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_output_device_id&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_output_device_id&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">string_result</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="nb">int</span><span class="p">)</span>
+
 <span class="k">def</span> <span class="nf">libvlc_audio_output_device_enum</span><span class="p">(</span><span class="n">mp</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Gets a list of potential audio output devices,</span>
 <span class="sd">    See L{libvlc_audio_output_device_set}().</span>
@@ -6392,7 +6466,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">    some circumstances. By default, it is recommended to not specify any</span>
 <span class="sd">    explicit audio device.</span>
 <span class="sd">    @param mp: media player.</span>
-<span class="sd">    @return: A None-terminated linked list of potential audio output devices. It must be freed with L{libvlc_audio_output_device_list_release}().</span>
+<span class="sd">    @return: A None-terminated linked list of potential audio output devices. It must be freed it with L{libvlc_audio_output_device_list_release}().</span>
 <span class="sd">    @version: LibVLC 2.2.0 or later.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_output_device_enum&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
@@ -6412,7 +6486,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="sd">    explicit audio device.</span>
 <span class="sd">    @param p_instance: libvlc instance.</span>
 <span class="sd">    @param psz_aout: audio output name (as returned by L{libvlc_audio_output_list_get}()).</span>
-<span class="sd">    @return: A None-terminated linked list of potential audio output devices. It must be freed with L{libvlc_audio_output_device_list_release}().</span>
+<span class="sd">    @return: A None-terminated linked list of potential audio output devices. It must be freed it with L{libvlc_audio_output_device_list_release}().</span>
 <span class="sd">    @version: LibVLC 2.1.0 or later.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_output_device_list_get&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
@@ -6461,27 +6535,6 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
                     <span class="kc">None</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
     <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">mp</span><span class="p">,</span> <span class="n">module</span><span class="p">,</span> <span class="n">device_id</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_audio_output_device_get</span><span class="p">(</span><span class="n">mp</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get the current audio output device identifier.</span>
-<span class="sd">    This complements L{libvlc_audio_output_device_set}().</span>
-<span class="sd">    @warning: The initial value for the current audio output device identifier</span>
-<span class="sd">    may not be set or may be some unknown value. A LibVLC application should</span>
-<span class="sd">    compare this value against the known device identifiers (e.g. those that</span>
-<span class="sd">    were previously retrieved by a call to L{libvlc_audio_output_device_enum} or</span>
-<span class="sd">    L{libvlc_audio_output_device_list_get}) to find the current audio output device.</span>
-<span class="sd">    It is possible that the selected audio output device changes (an external</span>
-<span class="sd">    change) without a call to L{libvlc_audio_output_device_set}. That may make this</span>
-<span class="sd">    method unsuitable to use if a LibVLC application is attempting to track</span>
-<span class="sd">    dynamic audio device changes as they happen.</span>
-<span class="sd">    @param mp: media player.</span>
-<span class="sd">    @return: the current audio output device identifier None if no device is selected or in case of error (the result must be released with free() or L{libvlc_free}()).</span>
-<span class="sd">    @version: LibVLC 3.0.0 or later.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_output_device_get&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_output_device_get&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">mp</span><span class="p">)</span>
-
 <span class="k">def</span> <span class="nf">libvlc_audio_toggle_mute</span><span class="p">(</span><span class="n">p_mi</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Toggle mute status.</span>
 <span class="sd">    @param p_mi: media player @warning Toggling mute atomically is not always possible: On some platforms, other processes can mute the VLC audio playback stream asynchronously. Thus, there is a small race condition where toggling will not work. See also the limitations of L{libvlc_audio_set_mute}().</span>
@@ -6545,7 +6598,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="k">def</span> <span class="nf">libvlc_audio_get_track_description</span><span class="p">(</span><span class="n">p_mi</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Get the description of available audio tracks.</span>
 <span class="sd">    @param p_mi: media player.</span>
-<span class="sd">    @return: list with description of available audio tracks, or None. It must be freed with L{libvlc_track_description_list_release}().</span>
+<span class="sd">    @return: list with description of available audio tracks, or None.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_get_track_description&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
         <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_audio_get_track_description&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
@@ -6786,310 +6839,167 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
                     <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">)</span>
     <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mi</span><span class="p">,</span> <span class="n">p_equalizer</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_release</span><span class="p">(</span><span class="n">p_instance</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Release the vlm instance related to the given L{Instance}.</span>
-<span class="sd">    @param p_instance: the instance.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_new</span><span class="p">(</span><span class="n">p_instance</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Create new media_list_player.</span>
+<span class="sd">    @param p_instance: libvlc instance.</span>
+<span class="sd">    @return: media list player instance or None on error.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="kc">None</span><span class="p">,</span> <span class="n">Instance</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_new&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_new&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">MediaListPlayer</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">)</span>
     <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_add_broadcast</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">,</span> <span class="n">psz_output</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">,</span> <span class="n">b_loop</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Add a broadcast, with one input.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the name of the new broadcast.</span>
-<span class="sd">    @param psz_input: the input MRL.</span>
-<span class="sd">    @param psz_output: the output MRL (the parameter to the &quot;sout&quot; variable).</span>
-<span class="sd">    @param i_options: number of additional options.</span>
-<span class="sd">    @param ppsz_options: additional options.</span>
-<span class="sd">    @param b_enabled: boolean for enabling the new broadcast.</span>
-<span class="sd">    @param b_loop: Should this broadcast be played in loop ?</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_add_broadcast&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_add_broadcast&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ListPOINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">,</span> <span class="n">psz_output</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">,</span> <span class="n">b_loop</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_vlm_add_vod</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">,</span> <span class="n">psz_mux</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Add a vod, with one input.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the name of the new vod media.</span>
-<span class="sd">    @param psz_input: the input MRL.</span>
-<span class="sd">    @param i_options: number of additional options.</span>
-<span class="sd">    @param ppsz_options: additional options.</span>
-<span class="sd">    @param b_enabled: boolean for enabling the new vod.</span>
-<span class="sd">    @param psz_mux: the muxer of the vod media.</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_add_vod&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_add_vod&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ListPOINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">,</span> <span class="n">psz_mux</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_vlm_del_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Delete a media (VOD or broadcast).</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the media to delete.</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_del_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_del_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_vlm_set_enabled</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Enable or disable a media (VOD or broadcast).</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the media to work on.</span>
-<span class="sd">    @param b_enabled: the new status.</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_enabled&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_enabled&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_vlm_set_output</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_output</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Set the output for a media.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the media to work on.</span>
-<span class="sd">    @param psz_output: the output MRL (the parameter to the &quot;sout&quot; variable).</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_output&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_output&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_output</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_vlm_set_input</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Set a media&#39;s input MRL. This will delete all existing inputs and</span>
-<span class="sd">    add the specified one.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the media to work on.</span>
-<span class="sd">    @param psz_input: the input MRL.</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_input&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_input&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_vlm_add_input</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Add a media&#39;s input MRL. This will add the specified one.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the media to work on.</span>
-<span class="sd">    @param psz_input: the input MRL.</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_add_input&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_add_input&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_vlm_set_loop</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">b_loop</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Set a media&#39;s loop status.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the media to work on.</span>
-<span class="sd">    @param b_loop: the new status.</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
-<span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_loop&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_loop&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">b_loop</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_vlm_set_mux</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_mux</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Set a media&#39;s vod muxer.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the media to work on.</span>
-<span class="sd">    @param psz_mux: the new muxer.</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_release</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Release a media_list_player after use</span>
+<span class="sd">    Decrement the reference count of a media player object. If the</span>
+<span class="sd">    reference count is 0, then L{libvlc_media_list_player_release}() will</span>
+<span class="sd">    release the media player object. If the media player object</span>
+<span class="sd">    has been released, then it should not be used again.</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_mux&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_set_mux&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_mux</span><span class="p">)</span>
-
-<span class="k">def</span> <span class="nf">libvlc_vlm_change_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">,</span> <span class="n">psz_output</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">,</span> <span class="n">b_loop</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Edit the parameters of a media. This will delete all existing inputs and</span>
-<span class="sd">    add the specified one.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the name of the new broadcast.</span>
-<span class="sd">    @param psz_input: the input MRL.</span>
-<span class="sd">    @param psz_output: the output MRL (the parameter to the &quot;sout&quot; variable).</span>
-<span class="sd">    @param i_options: number of additional options.</span>
-<span class="sd">    @param ppsz_options: additional options.</span>
-<span class="sd">    @param b_enabled: boolean for enabling the new broadcast.</span>
-<span class="sd">    @param b_loop: Should this broadcast be played in loop ?</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_release&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_release&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_retain</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Retain a reference to a media player list object. Use</span>
+<span class="sd">    L{libvlc_media_list_player_release}() to decrement reference count.</span>
+<span class="sd">    @param p_mlp: media player list object.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_change_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_change_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ListPOINTER</span><span class="p">(</span><span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">),</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">psz_input</span><span class="p">,</span> <span class="n">psz_output</span><span class="p">,</span> <span class="n">i_options</span><span class="p">,</span> <span class="n">ppsz_options</span><span class="p">,</span> <span class="n">b_enabled</span><span class="p">,</span> <span class="n">b_loop</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_retain&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_retain&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_play_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Play the named broadcast.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the name of the broadcast.</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_event_manager</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Return the event manager of this media_list_player.</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
+<span class="sd">    @return: the event manager.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_play_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_play_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_event_manager&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_event_manager&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">EventManager</span><span class="p">),</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_stop_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Stop the named broadcast.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the name of the broadcast.</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_set_media_player</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">p_mi</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Replace media player in media_list_player with this instance.</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
+<span class="sd">    @param p_mi: media player instance.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_stop_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_stop_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_set_media_player&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_set_media_player&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">,</span> <span class="n">MediaPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">p_mi</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_pause_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Pause the named broadcast.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the name of the broadcast.</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_set_media_list</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">p_mlist</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Set the media list associated with the player.</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
+<span class="sd">    @param p_mlist: list of media.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_pause_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_pause_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_set_media_list&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_set_media_list&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">,</span> <span class="n">MediaList</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">p_mlist</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_seek_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">f_percentage</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Seek in the named broadcast.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the name of the broadcast.</span>
-<span class="sd">    @param f_percentage: the percentage to seek to.</span>
-<span class="sd">    @return: 0 on success, -1 on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_play</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Play media list.</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_seek_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_seek_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_float</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">f_percentage</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_play&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_play&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_show_media</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Return information about the named media as a JSON</span>
-<span class="sd">    string representation.</span>
-<span class="sd">    This function is mainly intended for debugging use,</span>
-<span class="sd">    if you want programmatic access to the state of</span>
-<span class="sd">    a vlm_media_instance_t, please use the corresponding</span>
-<span class="sd">    libvlc_vlm_get_media_instance_xxx -functions.</span>
-<span class="sd">    Currently there are no such functions available for</span>
-<span class="sd">    vlm_media_t though.</span>
-<span class="sd">    @param p_instance: the instance.</span>
-<span class="sd">    @param psz_name: the name of the media, if the name is an empty string, all media is described.</span>
-<span class="sd">    @return: string with information about named media, or None on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_pause</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Toggle pause (or resume) media list.</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_show_media&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_show_media&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">string_result</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_pause&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_pause&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_position</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get vlm_media instance position by name or instance id.</span>
-<span class="sd">    @param p_instance: a libvlc instance.</span>
-<span class="sd">    @param psz_name: name of vlm media instance.</span>
-<span class="sd">    @param i_instance: instance id.</span>
-<span class="sd">    @return: position as float or -1. on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_is_playing</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Is media list playing?</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
+<span class="sd">    @return: true for playing and false for not playing \libvlc_return_bool.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_position&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_position&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_float</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_is_playing&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_is_playing&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_time</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get vlm_media instance time by name or instance id.</span>
-<span class="sd">    @param p_instance: a libvlc instance.</span>
-<span class="sd">    @param psz_name: name of vlm media instance.</span>
-<span class="sd">    @param i_instance: instance id.</span>
-<span class="sd">    @return: time as integer or -1 on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_get_state</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Get current libvlc_state of media list player.</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
+<span class="sd">    @return: libvlc_state_t for media list player.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_time&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_time&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_get_state&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_get_state&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">State</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_length</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get vlm_media instance length by name or instance id.</span>
-<span class="sd">    @param p_instance: a libvlc instance.</span>
-<span class="sd">    @param psz_name: name of vlm media instance.</span>
-<span class="sd">    @param i_instance: instance id.</span>
-<span class="sd">    @return: length of media item or -1 on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_play_item_at_index</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">i_index</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Play media list item at position index.</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
+<span class="sd">    @param i_index: index in media list to play.</span>
+<span class="sd">    @return: 0 upon success -1 if the item wasn&#39;t found.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_length&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_length&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_play_item_at_index&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_play_item_at_index&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">i_index</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_rate</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get vlm_media instance playback rate by name or instance id.</span>
-<span class="sd">    @param p_instance: a libvlc instance.</span>
-<span class="sd">    @param psz_name: name of vlm media instance.</span>
-<span class="sd">    @param i_instance: instance id.</span>
-<span class="sd">    @return: playback rate or -1 on error.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_play_item</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">p_md</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Play the given media item.</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
+<span class="sd">    @param p_md: the media instance.</span>
+<span class="sd">    @return: 0 upon success, -1 if the media is not part of the media list.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_rate&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_rate&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_play_item&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_play_item&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">,</span> <span class="n">Media</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">p_md</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_title</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get vlm_media instance title number by name or instance id.</span>
-<span class="sd">    @param p_instance: a libvlc instance.</span>
-<span class="sd">    @param psz_name: name of vlm media instance.</span>
-<span class="sd">    @param i_instance: instance id.</span>
-<span class="sd">    @return: title as number or -1 on error.</span>
-<span class="sd">    @bug: will always return 0.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_stop</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Stop playing media list.</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_title&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_title&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_stop&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_stop&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_chapter</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get vlm_media instance chapter number by name or instance id.</span>
-<span class="sd">    @param p_instance: a libvlc instance.</span>
-<span class="sd">    @param psz_name: name of vlm media instance.</span>
-<span class="sd">    @param i_instance: instance id.</span>
-<span class="sd">    @return: chapter as number or -1 on error.</span>
-<span class="sd">    @bug: will always return 0.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_next</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Play next item from media list.</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
+<span class="sd">    @return: 0 upon success -1 if there is no next item.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_chapter&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_chapter&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_next&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_next&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_get_media_instance_seekable</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Is libvlc instance seekable ?</span>
-<span class="sd">    @param p_instance: a libvlc instance.</span>
-<span class="sd">    @param psz_name: name of vlm media instance.</span>
-<span class="sd">    @param i_instance: instance id.</span>
-<span class="sd">    @return: 1 if seekable, 0 if not, -1 if media does not exist.</span>
-<span class="sd">    @bug: will always return 0.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_previous</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Play previous item from media list.</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
+<span class="sd">    @return: 0 upon success -1 if there is no previous item.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_seekable&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_media_instance_seekable&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">Instance</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">,</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">,</span> <span class="n">psz_name</span><span class="p">,</span> <span class="n">i_instance</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_previous&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_previous&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_int</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">)</span>
 
-<span class="k">def</span> <span class="nf">libvlc_vlm_get_event_manager</span><span class="p">(</span><span class="n">p_instance</span><span class="p">):</span>
-    <span class="sd">&#39;&#39;&#39;Get libvlc_event_manager from a vlm media.</span>
-<span class="sd">    The p_event_manager is immutable, so you don&#39;t have to hold the lock.</span>
-<span class="sd">    @param p_instance: a libvlc instance.</span>
-<span class="sd">    @return: libvlc_event_manager.</span>
+<span class="k">def</span> <span class="nf">libvlc_media_list_player_set_playback_mode</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">e_mode</span><span class="p">):</span>
+    <span class="sd">&#39;&#39;&#39;Sets the playback mode for the playlist.</span>
+<span class="sd">    @param p_mlp: media list player instance.</span>
+<span class="sd">    @param e_mode: playback mode specification.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
-    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_event_manager&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
-        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_vlm_get_event_manager&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),),</span> <span class="n">class_result</span><span class="p">(</span><span class="n">EventManager</span><span class="p">),</span>
-                    <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span><span class="p">,</span> <span class="n">Instance</span><span class="p">)</span>
-    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_instance</span><span class="p">)</span>
+    <span class="n">f</span> <span class="o">=</span> <span class="n">_Cfunctions</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_set_playback_mode&#39;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">or</span> \
+        <span class="n">_Cfunction</span><span class="p">(</span><span class="s1">&#39;libvlc_media_list_player_set_playback_mode&#39;</span><span class="p">,</span> <span class="p">((</span><span class="mi">1</span><span class="p">,),</span> <span class="p">(</span><span class="mi">1</span><span class="p">,),),</span> <span class="kc">None</span><span class="p">,</span>
+                    <span class="kc">None</span><span class="p">,</span> <span class="n">MediaListPlayer</span><span class="p">,</span> <span class="n">PlaybackMode</span><span class="p">)</span>
+    <span class="k">return</span> <span class="n">f</span><span class="p">(</span><span class="n">p_mlp</span><span class="p">,</span> <span class="n">e_mode</span><span class="p">)</span>
 
 
 <span class="c1"># 4 function(s) blacklisted:</span>
@@ -7098,7 +7008,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="c1">#  libvlc_printerr</span>
 <span class="c1">#  libvlc_set_exit_handler</span>
 
-<span class="c1"># 31 function(s) not wrapped as methods:</span>
+<span class="c1"># 32 function(s) not wrapped as methods:</span>
 <span class="c1">#  libvlc_audio_equalizer_get_amp_at_index</span>
 <span class="c1">#  libvlc_audio_equalizer_get_band_count</span>
 <span class="c1">#  libvlc_audio_equalizer_get_band_frequency</span>
@@ -7112,23 +7022,24 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
 <span class="c1">#  libvlc_audio_equalizer_set_preamp</span>
 <span class="c1">#  libvlc_audio_output_device_list_release</span>
 <span class="c1">#  libvlc_audio_output_list_release</span>
-<span class="c1">#  libvlc_chapter_descriptions_release</span>
 <span class="c1">#  libvlc_clearerr</span>
 <span class="c1">#  libvlc_clock</span>
-<span class="c1">#  libvlc_errmsg</span>
 <span class="c1">#  libvlc_event_type_name</span>
 <span class="c1">#  libvlc_free</span>
 <span class="c1">#  libvlc_get_changeset</span>
 <span class="c1">#  libvlc_get_compiler</span>
 <span class="c1">#  libvlc_get_version</span>
+<span class="c1">#  libvlc_log_clear</span>
+<span class="c1">#  libvlc_log_close</span>
+<span class="c1">#  libvlc_log_count</span>
 <span class="c1">#  libvlc_log_get_context</span>
+<span class="c1">#  libvlc_log_get_iterator</span>
 <span class="c1">#  libvlc_log_get_object</span>
-<span class="c1">#  libvlc_media_get_codec_description</span>
 <span class="c1">#  libvlc_media_tracks_release</span>
 <span class="c1">#  libvlc_module_description_list_release</span>
 <span class="c1">#  libvlc_new</span>
-<span class="c1">#  libvlc_title_descriptions_release</span>
 <span class="c1">#  libvlc_track_description_list_release</span>
+<span class="c1">#  libvlc_track_description_release</span>
 <span class="c1">#  libvlc_vprinterr</span>
 
 <span class="c1"># Start of footer.py #</span>
@@ -7155,8 +7066,8 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="k">def</span> <span class="nf">libvlc_free</span><span class="p">(</span><span class="n">p</span><span class="p">):</span>
             <span class="k">pass</span>
 
-    <span class="c1"># ensure argtypes is right, because default type of int won&#39;t work</span>
-    <span class="c1"># on 64-bit systems</span>
+    <span class="c1"># ensure argtypes is right, because default type of int won&#39;t</span>
+    <span class="c1"># work on 64-bit systems</span>
     <span class="n">libvlc_free</span><span class="o">.</span><span class="n">argtypes</span> <span class="o">=</span> <span class="p">[</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_void_p</span> <span class="p">]</span>
 
 <span class="c1"># Version functions</span>
@@ -7179,7 +7090,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
     <span class="sd">&quot;&quot;&quot;Return the version of these bindings in hex or 0 if unavailable.</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">try</span><span class="p">:</span>
-        <span class="k">return</span> <span class="n">_dot2int</span><span class="p">(</span><span class="n">__version__</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s1">&#39;-&#39;</span><span class="p">)[</span><span class="o">-</span><span class="mi">1</span><span class="p">])</span>
+        <span class="k">return</span> <span class="n">_dot2int</span><span class="p">(</span><span class="n">__version__</span><span class="p">)</span>
     <span class="k">except</span> <span class="p">(</span><span class="ne">NameError</span><span class="p">,</span> <span class="ne">ValueError</span><span class="p">):</span>
         <span class="k">return</span> <span class="mi">0</span>
 
@@ -7191,7 +7102,6 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
     <span class="k">except</span> <span class="ne">ValueError</span><span class="p">:</span>
         <span class="k">return</span> <span class="mi">0</span>
 
-
 <span class="k">def</span> <span class="nf">debug_callback</span><span class="p">(</span><span class="n">event</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kwds</span><span class="p">):</span>
     <span class="sd">&#39;&#39;&#39;Example callback, useful for debugging.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
@@ -7202,8 +7112,9 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="n">l</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="nb">sorted</span><span class="p">(</span><span class="s1">&#39;</span><span class="si">%s</span><span class="s1">=</span><span class="si">%s</span><span class="s1">&#39;</span> <span class="o">%</span> <span class="n">t</span> <span class="k">for</span> <span class="n">t</span> <span class="ow">in</span> <span class="n">kwds</span><span class="o">.</span><span class="n">items</span><span class="p">()))</span>
     <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;Debug callback (</span><span class="si">%s</span><span class="s1">)&#39;</span> <span class="o">%</span> <span class="s1">&#39;, &#39;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">l</span><span class="p">))</span>
 
-<span class="k">if</span> <span class="vm">__name__</span> <span class="o">==</span> <span class="s1">&#39;__main__&#39;</span><span class="p">:</span>
 
+<span class="k">if</span> <span class="vm">__name__</span> <span class="o">==</span> <span class="s1">&#39;__main__&#39;</span><span class="p">:</span>
+    <span class="n">logging</span><span class="o">.</span><span class="n">basicConfig</span><span class="p">(</span><span class="n">level</span><span class="o">=</span><span class="n">logging</span><span class="o">.</span><span class="n">DEBUG</span><span class="p">)</span>
     <span class="k">try</span><span class="p">:</span>
         <span class="kn">from</span> <span class="nn">msvcrt</span> <span class="k">import</span> <span class="n">getch</span>
     <span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>
@@ -7233,7 +7144,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
             <span class="n">sys</span><span class="o">.</span><span class="n">stdout</span><span class="o">.</span><span class="n">flush</span><span class="p">()</span>
 
     <span class="k">def</span> <span class="nf">print_version</span><span class="p">():</span>
-        <span class="sd">&quot;&quot;&quot;Print libvlc version&quot;&quot;&quot;</span>
+        <span class="sd">&quot;&quot;&quot;Print version of this vlc.py and of the libvlc&quot;&quot;&quot;</span>
         <span class="k">try</span><span class="p">:</span>
             <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;Build date: </span><span class="si">%s</span><span class="s1"> (</span><span class="si">%#x</span><span class="s1">)&#39;</span> <span class="o">%</span> <span class="p">(</span><span class="n">build_date</span><span class="p">,</span> <span class="n">hex_version</span><span class="p">()))</span>
             <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;LibVLC version: </span><span class="si">%s</span><span class="s1"> (</span><span class="si">%#x</span><span class="s1">)&#39;</span> <span class="o">%</span> <span class="p">(</span><span class="n">bytes_to_str</span><span class="p">(</span><span class="n">libvlc_get_version</span><span class="p">()),</span> <span class="n">libvlc_hex_version</span><span class="p">()))</span>
@@ -7243,27 +7154,28 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="k">except</span><span class="p">:</span>
             <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;Error: </span><span class="si">%s</span><span class="s1">&#39;</span> <span class="o">%</span> <span class="n">sys</span><span class="o">.</span><span class="n">exc_info</span><span class="p">()[</span><span class="mi">1</span><span class="p">])</span>
 
-    <span class="k">if</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">:]</span> <span class="ow">and</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">]</span> <span class="ow">not</span> <span class="ow">in</span> <span class="p">(</span><span class="s1">&#39;-h&#39;</span><span class="p">,</span> <span class="s1">&#39;--help&#39;</span><span class="p">):</span>
+    <span class="k">if</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">:]</span> <span class="ow">and</span> <span class="s1">&#39;-h&#39;</span> <span class="ow">not</span> <span class="ow">in</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">:]</span> <span class="ow">and</span> <span class="s1">&#39;--help&#39;</span> <span class="ow">not</span> <span class="ow">in</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">:]:</span>
 
-        <span class="n">movie</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">expanduser</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span>
+        <span class="n">movie</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">expanduser</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="o">.</span><span class="n">pop</span><span class="p">())</span>
         <span class="k">if</span> <span class="ow">not</span> <span class="n">os</span><span class="o">.</span><span class="n">access</span><span class="p">(</span><span class="n">movie</span><span class="p">,</span> <span class="n">os</span><span class="o">.</span><span class="n">R_OK</span><span class="p">):</span>
             <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;Error: </span><span class="si">%s</span><span class="s1"> file not readable&#39;</span> <span class="o">%</span> <span class="n">movie</span><span class="p">)</span>
             <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
 
-        <span class="n">instance</span> <span class="o">=</span> <span class="n">Instance</span><span class="p">(</span><span class="s2">&quot;--sub-source marq&quot;</span><span class="p">)</span>
+        <span class="c1"># Need --sub-source=marq in order to use marquee below</span>
+        <span class="n">instance</span> <span class="o">=</span> <span class="n">Instance</span><span class="p">([</span><span class="s2">&quot;--sub-source=marq&quot;</span><span class="p">]</span> <span class="o">+</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">1</span><span class="p">:])</span>
         <span class="k">try</span><span class="p">:</span>
             <span class="n">media</span> <span class="o">=</span> <span class="n">instance</span><span class="o">.</span><span class="n">media_new</span><span class="p">(</span><span class="n">movie</span><span class="p">)</span>
-        <span class="k">except</span> <span class="ne">NameError</span><span class="p">:</span>
-            <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;NameError: </span><span class="si">%s</span><span class="s1"> (</span><span class="si">%s</span><span class="s1"> vs LibVLC </span><span class="si">%s</span><span class="s1">)&#39;</span> <span class="o">%</span> <span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">exc_info</span><span class="p">()[</span><span class="mi">1</span><span class="p">],</span>
-                                                       <span class="n">__version__</span><span class="p">,</span>
-                                                       <span class="n">libvlc_get_version</span><span class="p">()))</span>
+        <span class="k">except</span> <span class="p">(</span><span class="ne">AttributeError</span><span class="p">,</span> <span class="ne">NameError</span><span class="p">)</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
+            <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;</span><span class="si">%s</span><span class="s1">: </span><span class="si">%s</span><span class="s1"> (</span><span class="si">%s</span><span class="s1"> </span><span class="si">%s</span><span class="s1"> vs LibVLC </span><span class="si">%s</span><span class="s1">)&#39;</span> <span class="o">%</span> <span class="p">(</span><span class="n">e</span><span class="o">.</span><span class="vm">__class__</span><span class="o">.</span><span class="vm">__name__</span><span class="p">,</span> <span class="n">e</span><span class="p">,</span>
+                                                   <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span> <span class="n">__version__</span><span class="p">,</span>
+                                                   <span class="n">libvlc_get_version</span><span class="p">()))</span>
             <span class="n">sys</span><span class="o">.</span><span class="n">exit</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
         <span class="n">player</span> <span class="o">=</span> <span class="n">instance</span><span class="o">.</span><span class="n">media_player_new</span><span class="p">()</span>
         <span class="n">player</span><span class="o">.</span><span class="n">set_media</span><span class="p">(</span><span class="n">media</span><span class="p">)</span>
         <span class="n">player</span><span class="o">.</span><span class="n">play</span><span class="p">()</span>
 
         <span class="c1"># Some marquee examples.  Marquee requires &#39;--sub-source marq&#39; in the</span>
-        <span class="c1"># Instance() call above.  See &lt;http://www.videolan.org/doc/play-howto/en/ch04.html&gt;</span>
+        <span class="c1"># Instance() call above, see &lt;http://www.videolan.org/doc/play-howto/en/ch04.html&gt;</span>
         <span class="n">player</span><span class="o">.</span><span class="n">video_set_marquee_int</span><span class="p">(</span><span class="n">VideoMarqueeOption</span><span class="o">.</span><span class="n">Enable</span><span class="p">,</span> <span class="mi">1</span><span class="p">)</span>
         <span class="n">player</span><span class="o">.</span><span class="n">video_set_marquee_int</span><span class="p">(</span><span class="n">VideoMarqueeOption</span><span class="o">.</span><span class="n">Size</span><span class="p">,</span> <span class="mi">24</span><span class="p">)</span>  <span class="c1"># pixels</span>
         <span class="n">player</span><span class="o">.</span><span class="n">video_set_marquee_int</span><span class="p">(</span><span class="n">VideoMarqueeOption</span><span class="o">.</span><span class="n">Position</span><span class="p">,</span> <span class="n">Position</span><span class="o">.</span><span class="n">Bottom</span><span class="p">)</span>
@@ -7286,7 +7198,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
         <span class="n">event_manager</span><span class="o">.</span><span class="n">event_attach</span><span class="p">(</span><span class="n">EventType</span><span class="o">.</span><span class="n">MediaPlayerPositionChanged</span><span class="p">,</span> <span class="n">pos_callback</span><span class="p">,</span> <span class="n">player</span><span class="p">)</span>
 
         <span class="k">def</span> <span class="nf">mspf</span><span class="p">():</span>
-            <span class="sd">&quot;&quot;&quot;Milliseconds per frame.&quot;&quot;&quot;</span>
+            <span class="sd">&quot;&quot;&quot;Milliseconds per frame&quot;&quot;&quot;</span>
             <span class="k">return</span> <span class="nb">int</span><span class="p">(</span><span class="mi">1000</span> <span class="o">//</span> <span class="p">(</span><span class="n">player</span><span class="o">.</span><span class="n">get_fps</span><span class="p">()</span> <span class="ow">or</span> <span class="mi">25</span><span class="p">))</span>
 
         <span class="k">def</span> <span class="nf">print_info</span><span class="p">():</span>
@@ -7365,7 +7277,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
                 <span class="n">player</span><span class="o">.</span><span class="n">set_position</span><span class="p">(</span><span class="nb">float</span><span class="p">(</span><span class="s1">&#39;0.&#39;</span><span class="o">+</span><span class="n">k</span><span class="p">))</span>
 
     <span class="k">else</span><span class="p">:</span>
-        <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;Usage: </span><span class="si">%s</span><span class="s1"> &lt;movie_filename&gt;&#39;</span> <span class="o">%</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">0</span><span class="p">])</span>
+        <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;Usage: </span><span class="si">%s</span><span class="s1"> [options] &lt;movie_filename&gt;&#39;</span> <span class="o">%</span> <span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mi">0</span><span class="p">])</span>
         <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;Once launched, type ? for help.&#39;</span><span class="p">)</span>
         <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;&#39;</span><span class="p">)</span>
         <span class="n">print_version</span><span class="p">()</span>
@@ -7405,7 +7317,7 @@ <h1>Source code for vlc</h1><div class="highlight"><pre>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/_static/basic.css b/docs/_static/basic.css
index 6df76b0a..3c7223b1 100644
--- a/docs/_static/basic.css
+++ b/docs/_static/basic.css
@@ -445,10 +445,14 @@ dd {
     margin-left: 30px;
 }
 
-dt:target, .highlighted {
+dt:target, span.highlighted {
     background-color: #fbe54e;
 }
 
+rect.highlighted {
+    fill: #fbe54e;
+}
+
 dl.glossary dt {
     font-weight: bold;
     font-size: 1.1em;
diff --git a/docs/_static/doctools.js b/docs/_static/doctools.js
index 56549772..24992e64 100644
--- a/docs/_static/doctools.js
+++ b/docs/_static/doctools.js
@@ -45,7 +45,7 @@ jQuery.urlencode = encodeURIComponent;
  * it will always return arrays of strings for the value parts.
  */
 jQuery.getQueryParameters = function(s) {
-  if (typeof s == 'undefined')
+  if (typeof s === 'undefined')
     s = document.location.search;
   var parts = s.substr(s.indexOf('?') + 1).split('&');
   var result = {};
@@ -66,29 +66,53 @@ jQuery.getQueryParameters = function(s) {
  * span elements with the given class name.
  */
 jQuery.fn.highlightText = function(text, className) {
-  function highlight(node) {
-    if (node.nodeType == 3) {
+  function highlight(node, addItems) {
+    if (node.nodeType === 3) {
       var val = node.nodeValue;
       var pos = val.toLowerCase().indexOf(text);
       if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) {
-        var span = document.createElement("span");
-        span.className = className;
+        var span;
+        var isInSVG = jQuery(node).closest("body, svg, foreignObject").is("svg");
+        if (isInSVG) {
+          span = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
+        } else {
+          span = document.createElement("span");
+          span.className = className;
+        }
         span.appendChild(document.createTextNode(val.substr(pos, text.length)));
         node.parentNode.insertBefore(span, node.parentNode.insertBefore(
           document.createTextNode(val.substr(pos + text.length)),
           node.nextSibling));
         node.nodeValue = val.substr(0, pos);
+        if (isInSVG) {
+          var bbox = span.getBBox();
+          var rect = document.createElementNS("http://www.w3.org/2000/svg", "rect");
+       	  rect.x.baseVal.value = bbox.x;
+          rect.y.baseVal.value = bbox.y;
+          rect.width.baseVal.value = bbox.width;
+          rect.height.baseVal.value = bbox.height;
+          rect.setAttribute('class', className);
+          var parentOfText = node.parentNode.parentNode;
+          addItems.push({
+              "parent": node.parentNode,
+              "target": rect});
+        }
       }
     }
     else if (!jQuery(node).is("button, select, textarea")) {
       jQuery.each(node.childNodes, function() {
-        highlight(this);
+        highlight(this, addItems);
       });
     }
   }
-  return this.each(function() {
-    highlight(this);
+  var addItems = [];
+  var result = this.each(function() {
+    highlight(this, addItems);
   });
+  for (var i = 0; i < addItems.length; ++i) {
+    jQuery(addItems[i].parent).before(addItems[i].target);
+  }
+  return result;
 };
 
 /*
@@ -131,21 +155,21 @@ var Documentation = {
    * i18n support
    */
   TRANSLATIONS : {},
-  PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; },
+  PLURAL_EXPR : function(n) { return n === 1 ? 0 : 1; },
   LOCALE : 'unknown',
 
   // gettext and ngettext don't access this so that the functions
   // can safely bound to a different name (_ = Documentation.gettext)
   gettext : function(string) {
     var translated = Documentation.TRANSLATIONS[string];
-    if (typeof translated == 'undefined')
+    if (typeof translated === 'undefined')
       return string;
-    return (typeof translated == 'string') ? translated : translated[0];
+    return (typeof translated === 'string') ? translated : translated[0];
   },
 
   ngettext : function(singular, plural, n) {
     var translated = Documentation.TRANSLATIONS[singular];
-    if (typeof translated == 'undefined')
+    if (typeof translated === 'undefined')
       return (n == 1) ? singular : plural;
     return translated[Documentation.PLURALEXPR(n)];
   },
@@ -216,7 +240,7 @@ var Documentation = {
       var src = $(this).attr('src');
       var idnum = $(this).attr('id').substr(7);
       $('tr.cg-' + idnum).toggle();
-      if (src.substr(-9) == 'minus.png')
+      if (src.substr(-9) === 'minus.png')
         $(this).attr('src', src.substr(0, src.length-9) + 'plus.png');
       else
         $(this).attr('src', src.substr(0, src.length-8) + 'minus.png');
@@ -248,7 +272,7 @@ var Documentation = {
     var path = document.location.pathname;
     var parts = path.split(/\//);
     $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() {
-      if (this == '..')
+      if (this === '..')
         parts.pop();
     });
     var url = parts.join('/');
diff --git a/docs/_static/searchtools.js b/docs/_static/searchtools.js
index c8215738..33fedf43 100644
--- a/docs/_static/searchtools.js
+++ b/docs/_static/searchtools.js
@@ -540,6 +540,9 @@ var Search = {
           });
         } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
           var suffix = DOCUMENTATION_OPTIONS.SOURCELINK_SUFFIX;
+          if (suffix === undefined) {
+            suffix = '.txt';
+          }
           $.ajax({url: DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' + item[5] + (item[5].slice(-suffix.length) === suffix ? '' : suffix),
                   dataType: "text",
                   complete: function(jqxhr, textstatus) {
diff --git a/docs/genindex.html b/docs/genindex.html
index 9c022bb6..57ed8401 100644
--- a/docs/genindex.html
+++ b/docs/genindex.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -366,6 +366,10 @@ <h2 id="E">E</h2>
 
 <h2 id="F">F</h2>
 <table style="width: 100%" class="indextable genindextable"><tr>
+  <td style="width: 33%; vertical-align: top;"><ul>
+      <li><a href="pympress.html#pympress.document.fileopen">fileopen() (in module pympress.document)</a>
+</li>
+  </ul></td>
   <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="pympress.html#pympress.document.Link.follow">follow() (pympress.document.Link method)</a>
 </li>
@@ -403,17 +407,19 @@ <h2 id="G">G</h2>
 </li>
       <li><a href="pympress.html#pympress.config.Config.get_notes_layout">get_notes_layout() (pympress.config.Config method)</a>
 </li>
-  </ul></td>
-  <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="pympress.html#pympress.scribble.Scribbler.get_notes_mode">get_notes_mode() (pympress.scribble.Scribbler method)</a>
 
       <ul>
         <li><a href="pympress.html#pympress.ui.UI.get_notes_mode">(pympress.ui.UI method)</a>
 </li>
       </ul></li>
+  </ul></td>
+  <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="pympress.html#pympress.config.Config.get_plain_layout">get_plain_layout() (pympress.config.Config method)</a>
 </li>
       <li><a href="pympress.html#pympress.vlcvideo.VLCVideo.get_player_control_toolbar">get_player_control_toolbar() (pympress.vlcvideo.VLCVideo method)</a>
+</li>
+      <li><a href="pympress.html#pympress.util.get_pympress_meta">get_pympress_meta() (in module pympress.util)</a>
 </li>
       <li><a href="pympress.html#pympress.document.Page.get_size">get_size() (pympress.document.Page method)</a>
 </li>
@@ -717,14 +723,14 @@ <h2 id="P">P</h2>
 </li>
       <li><a href="pympress.html#pympress.ui.PDF_NOTES_PAGE">PDF_NOTES_PAGE (in module pympress.ui)</a>
 </li>
-  </ul></td>
-  <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="pympress.html#pympress.ui.PDF_REGULAR">PDF_REGULAR (in module pympress.ui)</a>
 </li>
       <li><a href="pympress.html#pympress.document.Page.ph">ph (pympress.document.Page attribute)</a>
 </li>
       <li><a href="pympress.html#pympress.ui.UI.pick_file">pick_file() (pympress.ui.UI method)</a>
 </li>
+  </ul></td>
+  <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="pympress.html#pympress.config.Config.placeable_widgets">placeable_widgets (pympress.config.Config attribute)</a>
 
       <ul>
@@ -758,6 +764,18 @@ <h2 id="P">P</h2>
       <li><a href="pympress.html#pympress.scribble.Scribbler.pop_scribble">pop_scribble() (pympress.scribble.Scribbler method)</a>
 </li>
       <li><a href="pympress.html#pympress.surfacecache.SurfaceCache.prerender">prerender() (pympress.surfacecache.SurfaceCache method)</a>
+</li>
+      <li><a href="pympress.html#pympress.ui.UI.pres_annot">pres_annot (pympress.ui.UI attribute)</a>
+</li>
+      <li><a href="pympress.html#pympress.ui.UI.pres_blank">pres_blank (pympress.ui.UI attribute)</a>
+</li>
+      <li><a href="pympress.html#pympress.ui.UI.pres_fullscreen">pres_fullscreen (pympress.ui.UI attribute)</a>
+</li>
+      <li><a href="pympress.html#pympress.scribble.Scribbler.pres_highlight">pres_highlight (pympress.scribble.Scribbler attribute)</a>
+</li>
+      <li><a href="pympress.html#pympress.ui.UI.pres_notes">pres_notes (pympress.ui.UI attribute)</a>
+</li>
+      <li><a href="pympress.html#pympress.talk_time.TimeCounter.pres_pause">pres_pause (pympress.talk_time.TimeCounter attribute)</a>
 </li>
       <li><a href="pympress.html#pympress.ui.UI.prev_button">prev_button (pympress.ui.UI attribute)</a>
 </li>
@@ -934,6 +952,8 @@ <h2 id="S">S</h2>
       <li><a href="pympress.html#pympress.editable_label.EstimatedTalkTime.stop_editing_page_number">stop_editing_page_number() (pympress.editable_label.EstimatedTalkTime method)</a>
 </li>
       <li><a href="pympress.html#pympress.surfacecache.SurfaceCache.surface_cache">surface_cache (pympress.surfacecache.SurfaceCache attribute)</a>
+</li>
+      <li><a href="pympress.html#pympress.surfacecache.SurfaceCache.surface_factory">surface_factory (pympress.surfacecache.SurfaceCache attribute)</a>
 </li>
       <li><a href="pympress.html#pympress.surfacecache.SurfaceCache.surface_size">surface_size (pympress.surfacecache.SurfaceCache attribute)</a>
 </li>
@@ -1046,6 +1066,8 @@ <h2 id="V">V</h2>
   </ul></td>
   <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="pympress.html#pympress.config.Config.validate_layout">validate_layout() (pympress.config.Config method)</a>
+</li>
+      <li><a href="pympress.html#pympress.extras.Media.vlc_support_enabled">vlc_support_enabled() (pympress.extras.Media static method)</a>
 </li>
       <li><a href="pympress.html#pympress.vlcvideo.VLCVideo">VLCVideo (class in pympress.vlcvideo)</a>
 </li>
@@ -1120,7 +1142,7 @@ <h2 id="Y">Y</h2>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/index.html b/docs/index.html
index 809db7f6..b42e0bc0 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="#" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -234,7 +234,7 @@ <h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Pe
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/objects.inv b/docs/objects.inv
index 11a01af4..59a02fdc 100644
Binary files a/docs/objects.inv and b/docs/objects.inv differ
diff --git a/docs/py-modindex.html b/docs/py-modindex.html
index 142da462..96e17a99 100644
--- a/docs/py-modindex.html
+++ b/docs/py-modindex.html
@@ -59,7 +59,7 @@
 	<br />
 	<a href="index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -270,7 +270,7 @@ <h1>Python Module Index</h1>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/pympress.html b/docs/pympress.html
index 70f42c84..17323484 100644
--- a/docs/pympress.html
+++ b/docs/pympress.html
@@ -57,7 +57,7 @@
 	<br />
 	<a href="index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -718,6 +718,30 @@ <h3><a class="reference internal" href="#module-pympress.ui" title="pympress.ui"
 <dd><p>Dictionary of <a class="reference external" href="https://lazka.github.io/pgi-docs/Gtk-3.0/classes/Widget.html#Gtk.Widget" title="(in Gtk 3.0 v3.0)"><code class="xref py py-class docutils literal"><span class="pre">Widget</span></code></a> from the presenter window that can be dynamically rearranged</p>
 </dd></dl>
 
+<dl class="attribute">
+<dt id="pympress.ui.UI.pres_annot">
+<code class="descname">pres_annot</code><em class="property"> = None</em><a class="headerlink" href="#pympress.ui.UI.pres_annot" title="Permalink to this definition">¶</a></dt>
+<dd><p><a class="reference external" href="https://lazka.github.io/pgi-docs/Gtk-3.0/classes/CheckMenuItem.html#Gtk.CheckMenuItem" title="(in Gtk 3.0 v3.0)"><code class="xref py py-class docutils literal"><span class="pre">CheckMenuItem</span></code></a> that shows whether the annotations are toggled</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="pympress.ui.UI.pres_blank">
+<code class="descname">pres_blank</code><em class="property"> = None</em><a class="headerlink" href="#pympress.ui.UI.pres_blank" title="Permalink to this definition">¶</a></dt>
+<dd><p><a class="reference external" href="https://lazka.github.io/pgi-docs/Gtk-3.0/classes/CheckMenuItem.html#Gtk.CheckMenuItem" title="(in Gtk 3.0 v3.0)"><code class="xref py py-class docutils literal"><span class="pre">CheckMenuItem</span></code></a> that shows whether the blank mode is toggled</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="pympress.ui.UI.pres_fullscreen">
+<code class="descname">pres_fullscreen</code><em class="property"> = None</em><a class="headerlink" href="#pympress.ui.UI.pres_fullscreen" title="Permalink to this definition">¶</a></dt>
+<dd><p><a class="reference external" href="https://lazka.github.io/pgi-docs/Gtk-3.0/classes/CheckMenuItem.html#Gtk.CheckMenuItem" title="(in Gtk 3.0 v3.0)"><code class="xref py py-class docutils literal"><span class="pre">CheckMenuItem</span></code></a> that shows whether the c_win is fullscreen</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="pympress.ui.UI.pres_notes">
+<code class="descname">pres_notes</code><em class="property"> = None</em><a class="headerlink" href="#pympress.ui.UI.pres_notes" title="Permalink to this definition">¶</a></dt>
+<dd><p><a class="reference external" href="https://lazka.github.io/pgi-docs/Gtk-3.0/classes/CheckMenuItem.html#Gtk.CheckMenuItem" title="(in Gtk 3.0 v3.0)"><code class="xref py py-class docutils literal"><span class="pre">CheckMenuItem</span></code></a> that shows whether the annotations are toggled</p>
+</dd></dl>
+
 <dl class="attribute">
 <dt id="pympress.ui.UI.prev_button">
 <code class="descname">prev_button</code><em class="property"> = None</em><a class="headerlink" href="#pympress.ui.UI.prev_button" title="Permalink to this definition">¶</a></dt>
@@ -824,8 +848,18 @@ <h3><a class="reference internal" href="#module-pympress.ui" title="pympress.ui"
 
 <dl class="method">
 <dt id="pympress.ui.UI.switch_annotations">
-<code class="descname">switch_annotations</code><span class="sig-paren">(</span><em>*args</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/ui.html#UI.switch_annotations"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.ui.UI.switch_annotations" title="Permalink to this definition">¶</a></dt>
+<code class="descname">switch_annotations</code><span class="sig-paren">(</span><em>widget</em>, <em>event=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/ui.html#UI.switch_annotations"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.ui.UI.switch_annotations" title="Permalink to this definition">¶</a></dt>
 <dd><p>Switch the display to show annotations or to hide them.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">whether the mode has been toggled.</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body"><a class="reference external" href="https://docs.python.org/3.4/library/functions.html#bool" title="(in Python v3.4)"><code class="xref py py-obj docutils literal"><span class="pre">bool</span></code></a></td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
@@ -836,8 +870,18 @@ <h3><a class="reference internal" href="#module-pympress.ui" title="pympress.ui"
 
 <dl class="method">
 <dt id="pympress.ui.UI.switch_blanked">
-<code class="descname">switch_blanked</code><span class="sig-paren">(</span><em>*args</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/ui.html#UI.switch_blanked"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.ui.UI.switch_blanked" title="Permalink to this definition">¶</a></dt>
+<code class="descname">switch_blanked</code><span class="sig-paren">(</span><em>widget</em>, <em>event=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/ui.html#UI.switch_blanked"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.ui.UI.switch_blanked" title="Permalink to this definition">¶</a></dt>
 <dd><p>Switch the blanked mode of the content screen.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">whether the mode has been toggled.</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body"><a class="reference external" href="https://docs.python.org/3.4/library/functions.html#bool" title="(in Python v3.4)"><code class="xref py py-obj docutils literal"><span class="pre">bool</span></code></a></td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="method">
@@ -863,8 +907,18 @@ <h3><a class="reference internal" href="#module-pympress.ui" title="pympress.ui"
 
 <dl class="method">
 <dt id="pympress.ui.UI.switch_mode">
-<code class="descname">switch_mode</code><span class="sig-paren">(</span><em>*args</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/ui.html#UI.switch_mode"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.ui.UI.switch_mode" title="Permalink to this definition">¶</a></dt>
+<code class="descname">switch_mode</code><span class="sig-paren">(</span><em>widget</em>, <em>event=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/ui.html#UI.switch_mode"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.ui.UI.switch_mode" title="Permalink to this definition">¶</a></dt>
 <dd><p>Switch the display mode to &quot;Notes mode&quot; or &quot;Normal mode&quot; (without notes).</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">whether the mode has been toggled.</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body"><a class="reference external" href="https://docs.python.org/3.4/library/functions.html#bool" title="(in Python v3.4)"><code class="xref py py-obj docutils literal"><span class="pre">bool</span></code></a></td>
+</tr>
+</tbody>
+</table>
 </dd></dl>
 
 <dl class="attribute">
@@ -1649,6 +1703,11 @@ <h3><a class="reference internal" href="#module-pympress.document" title="pympre
 
 </dd></dl>
 
+<dl class="function">
+<dt id="pympress.document.fileopen">
+<code class="descclassname">pympress.document.</code><code class="descname">fileopen</code><span class="sig-paren">(</span><em>f</em><span class="sig-paren">)</span><a class="headerlink" href="#pympress.document.fileopen" title="Permalink to this definition">¶</a></dt>
+<dd></dd></dl>
+
 <dl class="function">
 <dt id="pympress.document.get_extension">
 <code class="descclassname">pympress.document.</code><code class="descname">get_extension</code><span class="sig-paren">(</span><em>mime_type</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/document.html#get_extension"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.document.get_extension" title="Permalink to this definition">¶</a></dt>
@@ -1837,7 +1896,7 @@ <h3><a class="reference internal" href="#module-pympress.surfacecache" title="py
 scheduled on the main thread at idle times using GLib.idle_add().</p>
 <dl class="class">
 <dt id="pympress.surfacecache.OrderedDict">
-<em class="property">class </em><code class="descclassname">pympress.surfacecache.</code><code class="descname">OrderedDict</code><span class="sig-paren">(</span><em>*args</em>, <em>**kwds</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/surfacecache.html#OrderedDict"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.surfacecache.OrderedDict" title="Permalink to this definition">¶</a></dt>
+<em class="property">class </em><code class="descclassname">pympress.surfacecache.</code><code class="descname">OrderedDict</code><a class="reference internal" href="_modules/pympress/surfacecache.html#OrderedDict"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.surfacecache.OrderedDict" title="Permalink to this definition">¶</a></dt>
 <dd><p>Bases: <a class="reference external" href="https://docs.python.org/3.4/library/collections.html#collections.OrderedDict" title="(in Python v3.4)"><code class="xref py py-class docutils literal"><span class="pre">collections.OrderedDict</span></code></a></p>
 <p>OrderedDict for python2 compatibility, adding move_to_end().</p>
 <dl class="method">
@@ -1872,7 +1931,7 @@ <h3><a class="reference internal" href="#module-pympress.surfacecache" title="py
 
 <dl class="method">
 <dt id="pympress.surfacecache.SurfaceCache.add_widget">
-<code class="descname">add_widget</code><span class="sig-paren">(</span><em>widget_name</em>, <em>wtype</em>, <em>start_enabled=True</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/surfacecache.html#SurfaceCache.add_widget"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.surfacecache.SurfaceCache.add_widget" title="Permalink to this definition">¶</a></dt>
+<code class="descname">add_widget</code><span class="sig-paren">(</span><em>widget</em>, <em>wtype</em>, <em>start_enabled=True</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/surfacecache.html#SurfaceCache.add_widget"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.surfacecache.SurfaceCache.add_widget" title="Permalink to this definition">¶</a></dt>
 <dd><p>Add a widget to the list of widgets that have to be managed (for caching and prerendering).</p>
 <p>This creates new entries for <code class="docutils literal"><span class="pre">widget_name</span></code> in the needed internal data
 structures, and creates a new thread for prerendering pages for this widget.</p>
@@ -1881,7 +1940,7 @@ <h3><a class="reference internal" href="#module-pympress.surfacecache" title="py
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>widget_name</strong> (<a class="reference external" href="https://docs.python.org/3.4/library/stdtypes.html#str" title="(in Python v3.4)"><code class="xref py py-obj docutils literal"><span class="pre">str</span></code></a>) -- string used to identify a widget</li>
+<li><strong>widget</strong> (<a class="reference external" href="https://lazka.github.io/pgi-docs/Gtk-3.0/classes/Widget.html#Gtk.Widget" title="(in Gtk 3.0 v3.0)"><code class="xref py py-class docutils literal"><span class="pre">Widget</span></code></a>) -- The widget for which we need to cache</li>
 <li><strong>wtype</strong> (<a class="reference external" href="https://docs.python.org/3.4/library/functions.html#int" title="(in Python v3.4)"><code class="xref py py-obj docutils literal"><span class="pre">int</span></code></a>) -- type of document handled by the widget (see <a class="reference internal" href="#pympress.surfacecache.SurfaceCache.surface_type" title="pympress.surfacecache.SurfaceCache.surface_type"><code class="xref py py-attr docutils literal"><span class="pre">surface_type</span></code></a>)</li>
 <li><strong>start_enabled</strong> (<a class="reference external" href="https://docs.python.org/3.4/library/functions.html#bool" title="(in Python v3.4)"><code class="xref py py-obj docutils literal"><span class="pre">bool</span></code></a>) -- whether this widget is initially in the list of widgets to prerender</li>
 </ul>
@@ -2012,7 +2071,7 @@ <h3><a class="reference internal" href="#module-pympress.surfacecache" title="py
 <li>check if the job's result is not already available in the cache</li>
 <li>render it in a new <a class="reference external" href="https://www.cairographics.org/documentation/pycairo/3/reference/surfaces.html#cairo.ImageSurface" title="(in Pycairo v1.10)"><code class="xref py py-class docutils literal"><span class="pre">ImageSurface</span></code></a> if necessary</li>
 <li>store it in the cache if it was not added there since the beginning of
-the process</li>
+the process and the widget configuration is still valid</li>
 </ul>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
@@ -2094,6 +2153,13 @@ <h3><a class="reference internal" href="#module-pympress.surfacecache" title="py
 popped from the start of the cache.</p>
 </dd></dl>
 
+<dl class="attribute">
+<dt id="pympress.surfacecache.SurfaceCache.surface_factory">
+<code class="descname">surface_factory</code><em class="property"> = {}</em><a class="headerlink" href="#pympress.surfacecache.SurfaceCache.surface_factory" title="Permalink to this definition">¶</a></dt>
+<dd><p><a class="reference external" href="https://docs.python.org/3.4/library/stdtypes.html#dict" title="(in Python v3.4)"><code class="xref py py-obj docutils literal"><span class="pre">dict</span></code></a> containing functions that return a <a class="reference external" href="https://www.cairographics.org/documentation/pycairo/3/reference/surfaces.html#cairo.Surface" title="(in Pycairo v1.10)"><code class="xref py py-class docutils literal"><span class="pre">Surface</span></code></a> given a <a class="reference external" href="https://www.cairographics.org/documentation/pycairo/3/reference/context.html#cairo.Context" title="(in Pycairo v1.10)"><code class="xref py py-class docutils literal"><span class="pre">Context</span></code></a>, width <a class="reference external" href="https://docs.python.org/3.4/library/functions.html#int" title="(in Python v3.4)"><code class="xref py py-obj docutils literal"><span class="pre">int</span></code></a> and height <a class="reference external" href="https://docs.python.org/3.4/library/functions.html#int" title="(in Python v3.4)"><code class="xref py py-obj docutils literal"><span class="pre">int</span></code></a>
+see <code class="xref py py-func docutils literal"><span class="pre">create_similar()</span></code></p>
+</dd></dl>
+
 <dl class="attribute">
 <dt id="pympress.surfacecache.SurfaceCache.surface_size">
 <code class="descname">surface_size</code><em class="property"> = {}</em><a class="headerlink" href="#pympress.surfacecache.SurfaceCache.surface_size" title="Permalink to this definition">¶</a></dt>
@@ -2273,6 +2339,12 @@ <h3><a class="reference internal" href="#module-pympress.scribble" title="pympre
 <dd><p>Callback for the scribble undo button, to undo the last scribble</p>
 </dd></dl>
 
+<dl class="attribute">
+<dt id="pympress.scribble.Scribbler.pres_highlight">
+<code class="descname">pres_highlight</code><em class="property"> = None</em><a class="headerlink" href="#pympress.scribble.Scribbler.pres_highlight" title="Permalink to this definition">¶</a></dt>
+<dd><p><a class="reference external" href="https://lazka.github.io/pgi-docs/Gtk-3.0/classes/CheckMenuItem.html#Gtk.CheckMenuItem" title="(in Gtk 3.0 v3.0)"><code class="xref py py-class docutils literal"><span class="pre">CheckMenuItem</span></code></a> that shows whether the scribbling is toggled</p>
+</dd></dl>
+
 <dl class="method">
 <dt id="pympress.scribble.Scribbler.redraw_current_slide">
 <code class="descname">redraw_current_slide</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#pympress.scribble.Scribbler.redraw_current_slide" title="Permalink to this definition">¶</a></dt>
@@ -2514,7 +2586,7 @@ <h3><a class="reference internal" href="#module-pympress.pointer" title="pympres
 
 <dl class="attribute">
 <dt id="pympress.pointer.Pointer.pointer">
-<code class="descname">pointer</code><em class="property"> = &lt;Pixbuf object at 0x69004c8 (GdkPixbuf at 0x5a5d6c0)&gt;</em><a class="headerlink" href="#pympress.pointer.Pointer.pointer" title="Permalink to this definition">¶</a></dt>
+<code class="descname">pointer</code><em class="property"> = &lt;GdkPixbuf.Pixbuf object at 0x7f9f095dde10 (GdkPixbuf at 0x561aeebf8c00)&gt;</em><a class="headerlink" href="#pympress.pointer.Pointer.pointer" title="Permalink to this definition">¶</a></dt>
 <dd><p><a class="reference external" href="https://lazka.github.io/pgi-docs/GdkPixbuf-2.0/classes/Pixbuf.html#GdkPixbuf.Pixbuf" title="(in GdkPixbuf 2.0 v2.0)"><code class="xref py py-class docutils literal"><span class="pre">Pixbuf</span></code></a> to read XML descriptions of GUIs and load them.</p>
 </dd></dl>
 
@@ -2751,7 +2823,7 @@ <h3><a class="reference internal" href="#module-pympress.editable_label" title="
 
 <dl class="attribute">
 <dt id="pympress.editable_label.EstimatedTalkTime.entry_ett">
-<code class="descname">entry_ett</code><em class="property"> = &lt;Entry object at 0x68f6a20 (GtkEntry at 0x5862e80)&gt;</em><a class="headerlink" href="#pympress.editable_label.EstimatedTalkTime.entry_ett" title="Permalink to this definition">¶</a></dt>
+<code class="descname">entry_ett</code><em class="property"> = &lt;Gtk.Entry object at 0x7f9f096661f8 (GtkEntry at 0x561aeed32490)&gt;</em><a class="headerlink" href="#pympress.editable_label.EstimatedTalkTime.entry_ett" title="Permalink to this definition">¶</a></dt>
 <dd><p><a class="reference external" href="https://lazka.github.io/pgi-docs/Gtk-3.0/classes/Entry.html#Gtk.Entry" title="(in Gtk 3.0 v3.0)"><code class="xref py py-class docutils literal"><span class="pre">Entry</span></code></a> used to set the estimated talk time.</p>
 </dd></dl>
 
@@ -3008,6 +3080,12 @@ <h3><a class="reference internal" href="#module-pympress.talk_time" title="pympr
 <dd><p>Timer paused status, <a class="reference external" href="https://docs.python.org/3.4/library/functions.html#bool" title="(in Python v3.4)"><code class="xref py py-obj docutils literal"><span class="pre">bool</span></code></a>.</p>
 </dd></dl>
 
+<dl class="attribute">
+<dt id="pympress.talk_time.TimeCounter.pres_pause">
+<code class="descname">pres_pause</code><em class="property"> = None</em><a class="headerlink" href="#pympress.talk_time.TimeCounter.pres_pause" title="Permalink to this definition">¶</a></dt>
+<dd><p><a class="reference external" href="https://lazka.github.io/pgi-docs/Gtk-3.0/classes/CheckMenuItem.html#Gtk.CheckMenuItem" title="(in Gtk 3.0 v3.0)"><code class="xref py py-class docutils literal"><span class="pre">CheckMenuItem</span></code></a> that shows whether the time is toggled</p>
+</dd></dl>
+
 <dl class="method">
 <dt id="pympress.talk_time.TimeCounter.reset_timer">
 <code class="descname">reset_timer</code><span class="sig-paren">(</span><em>*args</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/talk_time.html#TimeCounter.reset_timer"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.talk_time.TimeCounter.reset_timer" title="Permalink to this definition">¶</a></dt>
@@ -3022,7 +3100,7 @@ <h3><a class="reference internal" href="#module-pympress.talk_time" title="pympr
 
 <dl class="method">
 <dt id="pympress.talk_time.TimeCounter.switch_pause">
-<code class="descname">switch_pause</code><span class="sig-paren">(</span><em>*args</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/talk_time.html#TimeCounter.switch_pause"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.talk_time.TimeCounter.switch_pause" title="Permalink to this definition">¶</a></dt>
+<code class="descname">switch_pause</code><span class="sig-paren">(</span><em>widget</em>, <em>event=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/talk_time.html#TimeCounter.switch_pause"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.talk_time.TimeCounter.switch_pause" title="Permalink to this definition">¶</a></dt>
 <dd><p>Switch the timer between paused mode and running (normal) mode.</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
@@ -3180,7 +3258,7 @@ <h3><a class="reference internal" href="#module-pympress.config" title="pympress
 <dl class="class">
 <dt id="pympress.config.Config">
 <em class="property">class </em><code class="descclassname">pympress.config.</code><code class="descname">Config</code><span class="sig-paren">(</span><em>config</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/config.html#Config"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.config.Config" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3.4/library/configparser.html#configparser.ConfigParser" title="(in Python v3.4)"><code class="xref py py-class docutils literal"><span class="pre">configparser.ConfigParser</span></code></a></p>
+<dd><p>Bases: <a class="reference external" href="https://docs.python.org/3.4/library/configparser.html#configparser.ConfigParser" title="(in Python v3.4)"><code class="xref py py-class docutils literal"><span class="pre">configparser.ConfigParser</span></code></a>, <a class="reference external" href="https://docs.python.org/3.4/library/functions.html#object" title="(in Python v3.4)"><code class="xref py py-class docutils literal"><span class="pre">object</span></code></a></p>
 <p>Manage configuration :Get the configuration from its file and store its back.</p>
 <dl class="method">
 <dt id="pympress.config.Config.get_notes_layout">
@@ -3214,7 +3292,7 @@ <h3><a class="reference internal" href="#module-pympress.config" title="pympress
 
 <dl class="attribute">
 <dt id="pympress.config.Config.placeable_widgets">
-<code class="descname">placeable_widgets</code><em class="property"> = {'annotations', 'next', 'notes', 'current'}</em><a class="headerlink" href="#pympress.config.Config.placeable_widgets" title="Permalink to this definition">¶</a></dt>
+<code class="descname">placeable_widgets</code><em class="property"> = {'current', 'next', 'annotations', 'notes'}</em><a class="headerlink" href="#pympress.config.Config.placeable_widgets" title="Permalink to this definition">¶</a></dt>
 <dd><p>Set of strings that are the valid names of widgets from the presenter window that can be dynamically rearranged</p>
 </dd></dl>
 
@@ -3386,7 +3464,7 @@ <h3><a class="reference internal" href="#module-pympress.extras" title="pympress
 
 <dl class="attribute">
 <dt id="pympress.extras.Annotations.annotation_renderer">
-<code class="descname">annotation_renderer</code><em class="property"> = &lt;CellRendererText object at 0x652bcf0 (GtkCellRendererText at 0x5a870f0)&gt;</em><a class="headerlink" href="#pympress.extras.Annotations.annotation_renderer" title="Permalink to this definition">¶</a></dt>
+<code class="descname">annotation_renderer</code><em class="property"> = &lt;Gtk.CellRendererText object at 0x7f9f095c1870 (GtkCellRendererText at 0x561aeed13110)&gt;</em><a class="headerlink" href="#pympress.extras.Annotations.annotation_renderer" title="Permalink to this definition">¶</a></dt>
 <dd><p><a class="reference external" href="https://lazka.github.io/pgi-docs/Gtk-3.0/classes/CellRendererText.html#Gtk.CellRendererText" title="(in Gtk 3.0 v3.0)"><code class="xref py py-class docutils literal"><span class="pre">CellRendererText</span></code></a> Text renderer for the annotations</p>
 </dd></dl>
 
@@ -3514,6 +3592,22 @@ <h3><a class="reference internal" href="#module-pympress.extras" title="pympress
 <dd><p>Resize all media overlays that are a child of c_overlay</p>
 </dd></dl>
 
+<dl class="staticmethod">
+<dt id="pympress.extras.Media.vlc_support_enabled">
+<em class="property">static </em><code class="descname">vlc_support_enabled</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/extras.html#Media.vlc_support_enabled"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.extras.Media.vlc_support_enabled" title="Permalink to this definition">¶</a></dt>
+<dd><p>Check whether the VLC support is enabled or not.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">whether vlc support is enabled</td>
+</tr>
+<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body"><a class="reference external" href="https://docs.python.org/3.4/library/functions.html#bool" title="(in Python v3.4)"><code class="xref py py-obj docutils literal"><span class="pre">bool</span></code></a></td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
 </dd></dl>
 
 </div>
@@ -3553,6 +3647,12 @@ <h3><a class="reference internal" href="#module-pympress.util" title="pympress.u
 </table>
 </dd></dl>
 
+<dl class="function">
+<dt id="pympress.util.get_pympress_meta">
+<code class="descclassname">pympress.util.</code><code class="descname">get_pympress_meta</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/util.html#get_pympress_meta"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.util.get_pympress_meta" title="Permalink to this definition">¶</a></dt>
+<dd><p>Get metadata (version, etc) from pympress' __init__.py</p>
+</dd></dl>
+
 <dl class="function">
 <dt id="pympress.util.get_style_provider">
 <code class="descclassname">pympress.util.</code><code class="descname">get_style_provider</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="reference internal" href="_modules/pympress/util.html#get_style_provider"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pympress.util.get_style_provider" title="Permalink to this definition">¶</a></dt>
@@ -3814,7 +3914,7 @@ <h3><a class="reference internal" href="#module-pympress.vlcvideo" title="pympre
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/search.html b/docs/search.html
index 7237ecca..bb5f939e 100644
--- a/docs/search.html
+++ b/docs/search.html
@@ -56,7 +56,7 @@
 	<br />
 	<a href="index.html" class="icon icon-home"> Docs home</a>
 	<div class="version">
-		v1.1.0.b1
+		v1.1.0
 	</div>
 
 	
@@ -195,7 +195,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'b&#39;0.6-220-g2eb8ebb&#39;',
+            VERSION:'b&#39;0.6-234-g9193ef3&#39;',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,
diff --git a/docs/searchindex.js b/docs/searchindex.js
index 9e2aab5a..c72b8489 100644
--- a/docs/searchindex.js
+++ b/docs/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["README","index","pympress"],envversion:53,filenames:["README.md","index.rst","pympress.md"],objects:{"pympress.builder":{Builder:[2,1,1,""]},"pympress.builder.Builder":{connect_signals:[2,2,1,""],get_callback_handler:[2,2,1,""],list_attributes:[2,2,1,""],load_ui:[2,2,1,""],load_widgets:[2,2,1,""],replace_layout:[2,2,1,""],signal_connector:[2,2,1,""],signal_resolver:[2,2,1,""]},"pympress.config":{Config:[2,1,1,""],layout_from_json:[2,5,1,""],recursive_unicode_to_str:[2,5,1,""]},"pympress.config.Config":{get_notes_layout:[2,2,1,""],get_plain_layout:[2,2,1,""],load_window_layouts:[2,2,1,""],notes_layout:[2,3,1,""],path_to_config:[2,4,1,""],placeable_widgets:[2,3,1,""],plain_layout:[2,3,1,""],save_config:[2,2,1,""],toggle_start:[2,2,1,""],update_notes_layout:[2,2,1,""],update_plain_layout:[2,2,1,""],validate_layout:[2,2,1,""],widget_layout_to_tree:[2,2,1,""]},"pympress.document":{Document:[2,1,1,""],EmptyDocument:[2,1,1,""],EmptyPage:[2,1,1,""],Link:[2,1,1,""],Page:[2,1,1,""],get_extension:[2,5,1,""]},"pympress.document.Document":{"goto":[2,2,1,""],cleanup_media_files:[2,2,1,""],create:[2,4,1,""],cur_page:[2,3,1,""],current_page:[2,2,1,""],doc:[2,3,1,""],get_full_path:[2,2,1,""],goto_end:[2,2,1,""],goto_home:[2,2,1,""],goto_next:[2,2,1,""],goto_prev:[2,2,1,""],has_notes:[2,2,1,""],hist_next:[2,2,1,""],hist_pos:[2,3,1,""],hist_prev:[2,2,1,""],history:[2,3,1,""],nb_pages:[2,3,1,""],next_page:[2,2,1,""],notes:[2,3,1,""],page:[2,2,1,""],page_change:[2,2,1,""],pages_cache:[2,3,1,""],pages_number:[2,2,1,""],path:[2,3,1,""],play_media:[2,2,1,""],remove_on_exit:[2,2,1,""],start_editing_page_number:[2,2,1,""],temp_files:[2,3,1,""]},"pympress.document.EmptyDocument":{page:[2,2,1,""]},"pympress.document.EmptyPage":{can_render:[2,2,1,""],render_cairo:[2,2,1,""]},"pympress.document.Link":{follow:[2,2,1,""],is_over:[2,2,1,""],x1:[2,3,1,""],x2:[2,3,1,""],y1:[2,3,1,""],y2:[2,3,1,""]},"pympress.document.Page":{annotations:[2,3,1,""],can_render:[2,2,1,""],get_annot_action:[2,2,1,""],get_annotations:[2,2,1,""],get_aspect_ratio:[2,2,1,""],get_link_action:[2,2,1,""],get_link_at:[2,2,1,""],get_media:[2,2,1,""],get_size:[2,2,1,""],links:[2,3,1,""],medias:[2,3,1,""],number:[2,2,1,""],page:[2,3,1,""],page_nb:[2,3,1,""],parent:[2,3,1,""],ph:[2,3,1,""],pw:[2,3,1,""],render_cairo:[2,2,1,""]},"pympress.editable_label":{EditableLabel:[2,1,1,""],EstimatedTalkTime:[2,1,1,""],PageNumber:[2,1,1,""]},"pympress.editable_label.EditableLabel":{cancel:[2,2,1,""],editing:[2,3,1,""],event_box:[2,3,1,""],more_actions:[2,2,1,""],on_keypress:[2,2,1,""],on_label_event:[2,2,1,""],restore_label:[2,2,1,""],shortcut_key:[2,3,1,""],start_editing:[2,2,1,""],stop_editing:[2,2,1,""],swap_label_for_entry:[2,2,1,""],validate:[2,2,1,""]},"pympress.editable_label.EstimatedTalkTime":{delayed_callback_connection:[2,2,1,""],eb_ett:[2,3,1,""],entry_ett:[2,3,1,""],est_time:[2,3,1,""],label_ett:[2,3,1,""],label_time:[2,3,1,""],more_actions:[2,2,1,""],restore_label:[2,2,1,""],stop_editing_page_number:[2,2,1,""],swap_label_for_entry:[2,2,1,""],validate:[2,2,1,""]},"pympress.editable_label.PageNumber":{cancel:[2,2,1,""],eb_cur:[2,3,1,""],goto_page:[2,2,1,""],hb_cur:[2,3,1,""],label_cur:[2,3,1,""],label_last:[2,3,1,""],max_page_number:[2,3,1,""],more_actions:[2,2,1,""],on_scroll:[2,2,1,""],page_change:[2,2,1,""],restore_label:[2,2,1,""],set_last:[2,2,1,""],spin_cur:[2,3,1,""],stop_editing_est_time:[2,2,1,""],swap_label_for_entry:[2,2,1,""],update_page_numbers:[2,2,1,""],validate:[2,2,1,""]},"pympress.extras":{Annotations:[2,1,1,""],Cursor:[2,1,1,""],Media:[2,1,1,""]},"pympress.extras.Annotations":{add_annotations:[2,2,1,""],annotation_renderer:[2,3,1,""],on_configure_annot:[2,2,1,""],on_scroll:[2,2,1,""],scrollable_treelist:[2,3,1,""],scrolled_window:[2,3,1,""]},"pympress.extras.Cursor":{set_cursor:[2,6,1,""]},"pympress.extras.Media":{c_overlay:[2,3,1,""],play:[2,2,1,""],replace_media_overlays:[2,2,1,""],resize:[2,2,1,""]},"pympress.pointer":{POINTER_HIDE:[2,7,1,""],POINTER_OFF:[2,7,1,""],POINTER_SHOW:[2,7,1,""],Pointer:[2,1,1,""]},"pympress.pointer.Pointer":{change_pointer:[2,2,1,""],config:[2,3,1,""],load_pointer:[2,2,1,""],pointer:[2,3,1,""],pointer_pos:[2,3,1,""],redraw_current_slide:[2,2,1,""],render_pointer:[2,2,1,""],show_pointer:[2,3,1,""],toggle_pointer:[2,2,1,""],track_pointer:[2,2,1,""]},"pympress.scribble":{Scribbler:[2,1,1,""]},"pympress.scribble.Scribbler":{c_overlay:[2,3,1,""],cache:[2,3,1,""],clear_scribble:[2,2,1,""],disable_scribbling:[2,2,1,""],draw_scribble:[2,2,1,""],enable_scribbling:[2,2,1,""],get_current_page:[2,2,1,""],get_notes_mode:[2,2,1,""],nav_scribble:[2,2,1,""],off_render:[2,3,1,""],on_configure_da:[2,2,1,""],p_central:[2,3,1,""],pop_scribble:[2,2,1,""],redraw_current_slide:[2,2,1,""],scribble_c_da:[2,3,1,""],scribble_c_eb:[2,3,1,""],scribble_color:[2,3,1,""],scribble_drawing:[2,3,1,""],scribble_list:[2,3,1,""],scribble_overlay:[2,3,1,""],scribble_p_da:[2,3,1,""],scribble_p_eb:[2,3,1,""],scribble_p_frame:[2,3,1,""],scribble_width:[2,3,1,""],scribbling_mode:[2,3,1,""],switch_scribbling:[2,2,1,""],toggle_scribble:[2,2,1,""],track_scribble:[2,2,1,""],update_color:[2,2,1,""],update_width:[2,2,1,""]},"pympress.surfacecache":{OrderedDict:[2,1,1,""],SurfaceCache:[2,1,1,""]},"pympress.surfacecache.OrderedDict":{move_to_end:[2,2,1,""]},"pympress.surfacecache.SurfaceCache":{active_widgets:[2,3,1,""],add_widget:[2,2,1,""],disable_prerender:[2,2,1,""],doc:[2,3,1,""],doc_lock:[2,3,1,""],enable_prerender:[2,2,1,""],get:[2,2,1,""],get_widget_type:[2,2,1,""],locks:[2,3,1,""],max_pages:[2,3,1,""],prerender:[2,2,1,""],renderer:[2,2,1,""],resize_widget:[2,2,1,""],set:[2,2,1,""],set_widget_type:[2,2,1,""],surface_cache:[2,3,1,""],surface_size:[2,3,1,""],surface_type:[2,3,1,""],swap_document:[2,2,1,""]},"pympress.talk_time":{TimeCounter:[2,1,1,""],TimeLabelColorer:[2,1,1,""]},"pympress.talk_time.TimeCounter":{delta:[2,3,1,""],ett:[2,3,1,""],label_clock:[2,3,1,""],label_colorer:[2,3,1,""],label_time:[2,3,1,""],pause:[2,2,1,""],paused:[2,3,1,""],reset_timer:[2,2,1,""],start_time:[2,3,1,""],switch_pause:[2,2,1,""],unpause:[2,2,1,""],update_time:[2,2,1,""]},"pympress.talk_time.TimeLabelColorer":{calc_color:[2,2,1,""],color_map:[2,3,1,""],default_color:[2,2,1,""],label_color_default:[2,3,1,""],label_time:[2,3,1,""],load_color_from_css:[2,2,1,""],update_time_color:[2,2,1,""]},"pympress.ui":{PDF_CONTENT_PAGE:[2,7,1,""],PDF_NOTES_PAGE:[2,7,1,""],PDF_REGULAR:[2,7,1,""],UI:[2,1,1,""]},"pympress.ui.UI":{adjust_frame_position:[2,2,1,""],annotations:[2,3,1,""],blanked:[2,3,1,""],c_da:[2,3,1,""],c_frame:[2,3,1,""],c_win:[2,3,1,""],cache:[2,3,1,""],click_link:[2,2,1,""],close_file:[2,2,1,""],config:[2,3,1,""],doc:[2,3,1,""],error_opening_file:[2,2,1,""],est_time:[2,3,1,""],get_notes_mode:[2,2,1,""],highlight_button:[2,3,1,""],hover_link:[2,2,1,""],laser:[2,3,1,""],make_cwin:[2,2,1,""],make_pwin:[2,2,1,""],medias:[2,3,1,""],menu_about:[2,2,1,""],mouse_pos_in_page:[2,2,1,""],next_button:[2,3,1,""],notes_mode:[2,3,1,""],on_configure_da:[2,2,1,""],on_configure_win:[2,2,1,""],on_drag_drop:[2,2,1,""],on_draw:[2,2,1,""],on_navigation:[2,2,1,""],on_page_change:[2,2,1,""],on_pane_event:[2,2,1,""],on_scroll:[2,2,1,""],on_window_state_event:[2,2,1,""],p_central:[2,3,1,""],p_da_cur:[2,3,1,""],p_da_next:[2,3,1,""],p_da_notes:[2,3,1,""],p_frame_annot:[2,3,1,""],p_frame_cur:[2,3,1,""],p_frame_next:[2,3,1,""],p_frame_notes:[2,3,1,""],p_win:[2,3,1,""],page_number:[2,3,1,""],page_preview:[2,2,1,""],page_preview_nb:[2,3,1,""],pane_handle_pos:[2,3,1,""],pick_file:[2,2,1,""],placeable_widgets:[2,3,1,""],prev_button:[2,3,1,""],recent_document:[2,2,1,""],redraw_current_slide:[2,2,1,""],redraw_panes:[2,2,1,""],redraw_timeout:[2,3,1,""],resize_panes:[2,3,1,""],run:[2,2,1,""],save_and_quit:[2,2,1,""],scribbler:[2,3,1,""],setup_screens:[2,2,1,""],show_annotations:[2,3,1,""],show_bigbuttons:[2,3,1,""],swap_document:[2,2,1,""],swap_screens:[2,2,1,""],switch_annotations:[2,2,1,""],switch_bigbuttons:[2,2,1,""],switch_blanked:[2,2,1,""],switch_fullscreen:[2,2,1,""],switch_mode:[2,2,1,""],talk_time:[2,3,1,""],track_clicks:[2,2,1,""],track_motions:[2,2,1,""],update_frame_position:[2,2,1,""]},"pympress.util":{get_icon_pixbuf:[2,5,1,""],get_locale_dir:[2,5,1,""],get_style_provider:[2,5,1,""],get_ui_resource_file:[2,5,1,""],list_icons:[2,5,1,""],load_icons:[2,5,1,""],set_screensaver:[2,5,1,""]},"pympress.vlcvideo":{VLCVideo:[2,1,1,""],get_window_handle:[2,5,1,""],instance:[2,7,1,""]},"pympress.vlcvideo.VLCVideo":{controls:[2,3,1,""],get_player_control_toolbar:[2,2,1,""],hide:[2,2,1,""],movie_zone:[2,3,1,""],on_click:[2,2,1,""],overlay:[2,3,1,""],play:[2,2,1,""],player:[2,3,1,""],relative_margins:[2,3,1,""],resize:[2,2,1,""],set_file:[2,2,1,""]},pympress:{builder:[2,0,0,"-"],config:[2,0,0,"-"],document:[2,0,0,"-"],editable_label:[2,0,0,"-"],extras:[2,0,0,"-"],pointer:[2,0,0,"-"],scribble:[2,0,0,"-"],surfacecache:[2,0,0,"-"],talk_time:[2,0,0,"-"],ui:[2,0,0,"-"],util:[2,0,0,"-"],vlcvideo:[2,0,0,"-"]}},objnames:{"0":["py","module","Python module"],"1":["py","class","Python class"],"2":["py","method","Python method"],"3":["py","attribute","Python attribute"],"4":["py","staticmethod","Python static method"],"5":["py","function","Python function"],"6":["py","classmethod","Python class method"],"7":["py","data","Python data"]},objtypes:{"0":"py:module","1":"py:class","2":"py:method","3":"py:attribute","4":"py:staticmethod","5":"py:function","6":"py:classmethod","7":"py:data"},terms:{"0_18":0,"0x5555713b0d50":[],"0x55578082c0c0":[],"0x55578093e120":[],"0x55578095e420":[],"0x555780961150":[],"0x555ce42e34c0":[],"0x555ce43f5120":[],"0x556569d014c0":[],"0x556569e11120":[],"0x556569e30420":[],"0x556569e32d50":[],"0x55728dc608c0":[],"0x55728dd71120":[],"0x55728dd90420":[],"0x55728dd96150":[],"0x557ee354dcc0":[],"0x557ee3662120":[],"0x557ee3682420":[],"0x557ee3687150":[],"0x55810e6c0cc0":[],"0x55810e7d0120":[],"0x55810e7f0420":[],"0x55810e7f3550":[],"0x5588e146dcc0":[],"0x5588e1581120":[],"0x5588e15a0420":[],"0x5588e15a6550":[],"0x558a88f6c4c0":[],"0x558a8907b120":[],"0x558a89098420":[],"0x558a8909a150":[],"0x558ba5714cc0":[],"0x558ba5824120":[],"0x558ba5842420":[],"0x558ba5845550":[],"0x558de1fe9240":[],"0x558de20f1120":[],"0x558de2112420":[],"0x558de2116950":[],"0x558f3781d180":[],"0x558f37929120":[],"0x558f37946420":[],"0x558f37949150":[],"0x558fd92be4c0":[],"0x558fd93ce120":[],"0x558fd93ee950":[],"0x558fd93f2420":[],"0x5592775120c0":[],"0x559277625120":[],"0x559277648420":[],"0x55927764c550":[],"0x55a1f3cff4c0":[],"0x55a1f3e10120":[],"0x55a1f3e38420":[],"0x55a1f3e3ad50":[],"0x55a3475148c0":[],"0x55a347625120":[],"0x55a347634420":[],"0x55a347636d50":[],"0x55a3e569b4c0":[],"0x55a3e57a9120":[],"0x55a3e57c4420":[],"0x55a3e57c6950":[],"0x55a5cb97a580":[],"0x55a5cba8a120":[],"0x55a5cbaa8420":[],"0x55a5cbaaad50":[],"0x55a679f2d8c0":[],"0x55a67a03d120":[],"0x55a67a05e420":[],"0x55a67a064150":[],"0x55a9a8f59580":[],"0x55a9a9067120":[],"0x55a9a9088420":[],"0x55a9a908c550":[],"0x55a9b7560cc0":[],"0x55a9b7672120":[],"0x55a9b7682420":[],"0x55a9b7684150":[],"0x55aaece294c0":[],"0x55aaecf3d120":[],"0x55aaecf5c420":[],"0x55aaecf62150":[],"0x55ac60e800c0":[],"0x55ac60f93120":[],"0x55ac60fb2420":[],"0x55ac60fb8150":[],"0x55b3f1a70cc0":[],"0x55b3f1b80120":[],"0x55b3f1ba0420":[],"0x55b3f1ba6150":[],"0x55b5cfc1e8c0":[],"0x55b5cfd2f120":[],"0x55b5cfd38420":[],"0x55b5cfd3a550":[],"0x55b9df9298c0":[],"0x55b9dfa40110":[],"0x55b9dfa5e490":[],"0x55be8cece180":[],"0x55be8cfde120":[],"0x55be8d002420":[],"0x55be8d004d50":[],"0x55cad11254c0":[],"0x55cad1237120":[],"0x55cad1256420":[],"0x55cad1259150":[],"0x55ccd35bc8c0":[],"0x55ccd36cb120":[],"0x55cd41f7c180":[],"0x55cd4208b120":[],"0x55cd420a8420":[],"0x55cd420ad150":[],"0x55d2f49364c0":[],"0x55d2f4a49120":[],"0x55d2f4a5e420":[],"0x55d2f4a6e550":[],"0x55d50d6810c0":[],"0x55d50d793120":[],"0x55d50d7b4420":[],"0x55d50d7b8550":[],"0x55dbb8f3f8c0":[],"0x55dbb9052120":[],"0x55dbb9068420":[],"0x55dbb907a950":[],"0x55de553ca0c0":[],"0x55de554dd120":[],"0x55de554fc420":[],"0x55de554ff950":[],"0x55e0f7918550":[],"0x55e62ca76cc0":[],"0x55e62cb86120":[],"0x55e62cba8950":[],"0x55e62cbaa420":[],"0x55e72f0640c0":[],"0x55e72f178120":[],"0x55e72f18a420":[],"0x55e72f18c550":[],"0x55eb249028c0":[],"0x55eb24a15120":[],"0x55eb24a34420":[],"0x55eb24a3a550":[],"0x55ef8163b0c0":[],"0x55ef8174d120":[],"0x55ef8176a420":[],"0x55ef81770150":[],"0x55f03eca28c0":[],"0x55f03edb3120":[],"0x55f03edd6420":[],"0x55f03edda550":[],"0x55fb43808580":[],"0x55fb43915120":[],"0x55fb43924420":[],"0x55fb43927550":[],"0x5600f48084c0":[],"0x5600f4919120":[],"0x5600f4928420":[],"0x5600f492a150":[],"0x5602c47d04c0":[],"0x5602c48e4120":[],"0x5602c4904950":[],"0x5602c4908420":[],"0x560484c880c0":[],"0x560484d9e110":[],"0x560484dac490":[],"0x560806368cc0":[],"0x560806478120":[],"0x560806498420":[],"0x56080649a150":[],"0x56090cb09580":[],"0x56090cc19120":[],"0x56090cc2e420":[],"0x56090cc30550":[],"0x560bf093bcc0":[],"0x560bf0a50120":[],"0x560bf0a70420":[],"0x560bf0a75150":[],"0x560f1506d8c0":[],"0x560f15180120":[],"0x560f15192550":[],"0x560f151a2420":[],"0x5612c1a8bcc0":[],"0x5612c1b9d120":[],"0x5612c1bbdd50":[],"0x5612c1bc0420":[],"0x56177a01c580":[],"0x56177a129120":[],"0x56177a138420":[],"0x56177a13ad50":[],"0x561b59af60c0":[],"0x561b59c05120":[],"0x561b59c2e420":[],"0x561b59c30150":[],"0x561b6f866cc0":[],"0x561b6f97a120":[],"0x561b6f99a420":[],"0x561b6f99e550":[],"0x561dd69668c0":[],"0x561dd6a77120":[],"0x561dd6a86420":[],"0x561dd6a88150":[],"0x56217c5c08c0":[],"0x56217c6cf120":[],"0x56217c6e4420":[],"0x56217c6f7550":[],"0x562505513580":[],"0x56250561f120":[],"0x56250563e420":[],"0x562505640150":[],"0x56265cff1d20":[],"0x56265d239140":[],"0x562970424d80":[],"0x562970532120":[],"0x562970550420":[],"0x562970553550":[],"0x562d2bb214c0":[],"0x562d2bc35120":[],"0x562d2bc54420":[],"0x562d2bc58d50":[],"0x5643510dc8c0":[],"0x5643511ee120":[],"0x56435120c420":[],"0x56435120ed50":[],"0x5644c02fb0c0":[],"0x5644c0410120":[],"0x5644c0430420":[],"0x5644c0433150":[],"0x5649aa0ef4c0":[],"0x5649aa202120":[],"0x5649aa222420":[],"0x5649aa227150":[],"0x564f3dbcd8c0":[],"0x564f3dcde120":[],"0x564f3dcfe420":[],"0x564f3dd03150":[],"0x5862e80":2,"0x5a5d6c0":2,"0x5a870f0":2,"0x652bcf0":2,"0x68f6a20":2,"0x69004c8":2,"0x7efca0055090":[],"0x7efca005ddc8":[],"0x7efca0066d38":[],"0x7efca0315d38":[],"0x7efd5519cfc0":[],"0x7efd5519ef30":[],"0x7efd55b3cf78":[],"0x7efd55b5f360":[],"0x7f06c5825f78":[],"0x7f06c5848360":[],"0x7f0888119e10":[],"0x7f0888122510":[],"0x7f08881795a0":[],"0x7f088818b870":[],"0x7f0f6123eee8":[],"0x7f0f612465e8":[],"0x7f0f62386678":[],"0x7f0f6239c948":[],"0x7f0f88fb2048":[],"0x7f0f88fc2af8":[],"0x7f0f88fc7ca8":[],"0x7f0f897aad38":[],"0x7f147a245e58":[],"0x7f147a24d558":[],"0x7f147abb4630":[],"0x7f147abc7b88":[],"0x7f19a382da68":[],"0x7f19a3841240":[],"0x7f19a3848630":[],"0x7f19a3ff2678":[],"0x7f1c258bc048":[],"0x7f1c258cbaf8":[],"0x7f1c258d1ca8":[],"0x7f1c260b4d38":[],"0x7f20b2f2d870":[],"0x7f20b2f3b318":[],"0x7f20b2f3bea0":[],"0x7f20b37701f8":[],"0x7f20c4c0a3f0":[],"0x7f20c53fc6c0":[],"0x7f20c7736168":[],"0x7f21b0335e58":[],"0x7f21b0340240":[],"0x7f21b1477240":[],"0x7f21b1495990":[],"0x7f2558727f30":[],"0x7f2558748798":[],"0x7f265c3f73a8":[],"0x7f2bc3716fc0":[],"0x7f2bc3725bd0":[],"0x7f2bc3727948":[],"0x7f2bc3752870":[],"0x7f2c90040e10":[],"0x7f2c90048510":[],"0x7f2c9009d5e8":[],"0x7f2c900b2870":[],"0x7f2f9f481dc8":[],"0x7f2f9f48a4c8":[],"0x7f2fa402b558":[],"0x7f2fa403d828":[],"0x7f3061655288":[],"0x7f306165b678":[],"0x7f3062000630":[],"0x7f3062014d80":[],"0x7f32da603240":[],"0x7f32da603f30":[],"0x7f32db6f9e58":[],"0x7f32db7215a0":[],"0x7f3319f45fc0":[],"0x7f3319f58af8":[],"0x7f3319f5dca8":[],"0x7f331a741cf0":[],"0x7f33aa4d1d38":[],"0x7f33aa4e0900":[],"0x7f33aa4e94c8":[],"0x7f33ab5e5678":[],"0x7f3efebc9bd0":[],"0x7f3efebdb168":[],"0x7f3efebe2750":[],"0x7f3eff3c0828":[],"0x7f421c1c6fc0":[],"0x7f421c1d4d80":[],"0x7f421c1dbca8":[],"0x7f421c229d38":[],"0x7f441f347e58":[],"0x7f441f34f558":[],"0x7f44244a4678":[],"0x7f44244ba8b8":[],"0x7f52f92bf708":[],"0x7f52f92c2678":[],"0x7f52fa480678":[],"0x7f52fa495990":[],"0x7f55c0022e10":[],"0x7f55c002b510":[],"0x7f55c00825a0":[],"0x7f55c0094870":[],"0x7f561807eea0":[],"0x7f5618086558":[],"0x7f5618571678":[],"0x7f5618588900":[],"0x7f5716b48090":[],"0x7f5716b57b40":[],"0x7f5716b5cca8":[],"0x7f5717340d38":[],"0x7f5be16da9d8":[],"0x7f5be16dbdc8":[],"0x7f5be284fe10":[],"0x7f5be28770d8":[],"0x7f5ffcc14240":[],"0x7f5ffcc14f78":[],"0x7f5ffdd0be58":[],"0x7f5ffdd305e8":[],"0x7f6561f261f8":[],"0x7f6561f26f30":[],"0x7f656305ee58":[],"0x7f65630855a0":[],"0x7f743dfb4ea0":[],"0x7f743dfc7438":[],"0x7f743dfccab0":[],"0x7f743e7b4b88":[],"0x7f7571f96048":[],"0x7f7571f99708":[],"0x7f75728ff708":[],"0x7f7572915ab0":[],"0x7f7ca403dea0":[],"0x7f7ca4045558":[],"0x7f7ca40dc630":[],"0x7f7ca40f3900":[],"0x7f7e7d007120":[],"0x7f7e7d00d7e0":[],"0x7f7e7d971828":[],"0x7f7e7d98cc18":[],"0x7f7f206e55a0":[],"0x7f7f206fa5a0":[],"0x7f7f20ea5fc0":[],"0x7f829404d120":[],"0x7f829406d798":[],"0x7f8294080168":[],"0x7f8294080dc8":[],"0x7f8535ae91f8":[],"0x7f8535aef5a0":[],"0x7f8536492630":[],"0x7f85364a88b8":[],"0x7f86d41bfdc8":[],"0x7f86d41c74c8":[],"0x7f86d49265a0":[],"0x7f86d4938b88":[],"0x7f8fbc1d4990":[],"0x7f8fbc1e6678":[],"0x7f8fbc1eb5e8":[],"0x7f8fbcb52630":[],"0x7f9748c623a8":[],"0x7f9cc2080e58":[],"0x7f9cc20943f0":[],"0x7f9cc2099ab0":[],"0x7f9cc2880b40":[],"0x7f9e20898fc0":[],"0x7f9e208abab0":[],"0x7f9e208b1c18":[],"0x7f9e21094d38":[],"0x7fa06d674870":[],"0x7fa06d680dc8":[],"0x7fa06d6894c8":[],"0x7fa06de78558":[],"0x7fa0840f3438":[],"0x7fa0840f75e8":[],"0x7fa08418d630":[],"0x7fa0841a1948":[],"0x7fa98a661240":[],"0x7fa98a667630":[],"0x7fa98b00a630":[],"0x7fa98b01f900":[],"0x7fad427fce10":[],"0x7fad4280aab0":[],"0x7fad4280e7e0":[],"0x7fad43035750":[],"0x7fae878b9ca8":[],"0x7fae878c7870":[],"0x7fae878cd438":[],"0x7fae8c24e630":[],"0x7fb6413b2e58":[],"0x7fb6413bca20":[],"0x7fb6413c4798":[],"0x7fb641b71708":[],"0x7fbb9e3388b8":[],"0x7fbb9e34e678":[],"0x7fbb9e3543f0":[],"0x7fbb9eb3d4c8":[],"0x7fbdb13bfcf0":[],"0x7fbdb1d9dcf0":[],"0x7fbdb1dbe120":[],"0x7fbdb1dc4f78":[],"0x7fbdc1b6fea0":[],"0x7fbdc1b79828":[],"0x7fbdc1b7eab0":[],"0x7fbdc23a9750":[],"0x7fc00c0466c0":[],"0x7fc00c04b2d0":[],"0x7fc00c0ee240":[],"0x7fc00c0f8a68":[],"0x7fc0a0101f30":[],"0x7fc0a01095e8":[],"0x7fc0a06c46c0":[],"0x7fc0a06db990":[],"0x7fc2ccd2d090":[],"0x7fc2ccd35dc8":[],"0x7fc2ccd3dd38":[],"0x7fc2cd524d38":[],"0x7fcb48730048":[],"0x7fcb48738dc8":[],"0x7fcb4873fd38":[],"0x7fcb48f28d38":[],"0x7fd182278ea0":[],"0x7fd18227f5a0":[],"0x7fd1833bf678":[],"0x7fd1833d5948":[],"0x7fd92e91bdc8":[],"0x7fd92e92e360":[],"0x7fd92e931990":[],"0x7fd934226a20":[],"0x7feb68076048":[],"0x7feb68082e58":[],"0x7feb68084dc8":[],"0x7feb6863ccf0":[],"0x7fedf412d090":[],"0x7fedf4135dc8":[],"0x7fedf413dcf0":[],"0x7fedf418cd38":[],"0x7ff9fad0d288":[],"0x7ff9fad22990":[],"0x7ffabac82a68":[],"0x7ffabac917e0":[],"0x7ffabac97750":[],"0x7ffabb4476c0":[],"1_0":0,"2_0":0,"3_0":0,"boolean":2,"case":2,"class":2,"default":[0,2],"final":0,"float":2,"function":1,"goto":2,"import":2,"int":2,"long":2,"new":[0,2],"public":0,"return":2,"static":2,"switch":2,"true":2,"try":[0,2],"while":2,For:0,Its:2,The:[0,2],Used:2,Uses:2,abl:0,about:[0,2],abov:0,absolut:2,access:2,accident:2,accordingli:2,action:2,actiontyp:2,activ:2,active_widget:2,actual:2,add:[0,2],add_annot:2,add_widget:2,added:2,adding:2,adjust:[0,2],adjust_frame_posit:2,afraid:0,after:2,afterward:2,align:2,all:[0,2],allow:[0,2],almost:2,along:[0,2],alpha:2,alreadi:[0,2],also:[0,2],alwai:2,amd64:0,ani:[0,2],annot:0,annotation_render:2,annotatiosn:[],anoth:2,appdata:0,appear:[0,2],appli:[0,2],apt:0,area:2,arg:2,argument:2,around:2,ask:[0,2],aspect:2,aspectfram:2,associ:2,assum:[0,2],atcion:2,attr_list:2,attribut:2,avail:[0,2],avoid:2,back:2,bad:2,bar:0,base:2,base_target:2,basenam:2,beamer:0,been:[0,2],befor:2,begin:2,behaviour:2,being:2,belong:2,below:2,better:2,between:[0,2],beyond:2,big:2,binari:1,bind:0,bit:0,blank:2,blue:2,bool:2,both:[0,2],bound:2,box:[0,2],bring:2,build:2,builder:2,builderconnectfunc:2,built:2,button:[0,2],c_da:2,c_frame:2,c_overlai:2,c_win:2,c_win_fullscreen:[],cach:0,cairo:[0,2],cairo_context:2,cairocontext:2,calc_color:2,call:2,callback:2,calld:2,can:0,can_rend:2,cancel:[0,2],canva:2,capabl:2,captur:2,casa:2,cast:2,cellrenderertext:2,center:0,chang:[0,2],change_point:2,charact:2,check:[0,2],check_item:2,checkmenuitem:2,child:2,children:2,choic:0,choos:0,chooser:2,cimbali:0,circular:2,class_nam:2,classl:[],classmethod:2,cleanup_media_fil:2,clear:2,clear_scribbl:2,click:[0,2],click_link:2,clickabl:2,clock:[],clone:0,close_fil:2,closest:2,code:[0,2],collect:2,color:[0,2],color_map:2,colorbutton:2,com:[0,2],come:0,command:[0,2],comment:2,compat:2,complet:2,comput:2,conccur:2,concern:2,config:0,configpars:2,configur:0,connect:2,connect_object:2,connect_sign:2,connectflag:2,connector:2,consid:2,consol:0,consum:[0,2],contain:[0,2],content:[0,2],context:2,contraint:2,contribut:1,control:2,convent:0,convert:2,coordin:2,copi:2,correct:2,correspond:2,counter:2,cours:2,crash:2,creat:[0,2],css:2,cssprovid:2,ctrl:[0,2],ctrl_press:2,ctype:2,cur_nb:2,cur_pag:2,current:0,current_pag:2,cursor:[],cursor_nam:2,data:2,deal:2,decod:2,default_color:2,default_point:[],defin:2,definit:2,delai:2,delayed_callback_connect:2,delet:2,delta:2,depend:[1,2],depth:2,descript:2,design:[0,2],desir:2,destin:2,determin:2,dialog:2,dict:2,dictionari:2,differ:[0,2],dimens:2,diplai:[],direct:2,directli:2,directori:2,disabl:2,disable_prerend:2,disable_scribbl:2,displai:0,distribut:0,dll:0,do_key_press_ev:2,doc:[0,2],doc_lock:2,docpath:2,docstr:2,document:0,doe:2,doesn:[0,2],don:[0,2],done:[0,2],down:0,download:0,downsid:2,drag:[0,2],drag_context:2,dragcontext:2,draw:0,draw_scribbl:2,drawingarea:2,drawn:2,drop:2,dtype:2,dual:0,due:2,dummi:2,durat:0,dynam:2,each:2,easi:2,easili:0,eb_cur:2,eb_ett:2,edit:[],editablelabel:2,editing_cur:[],editing_cur_ett:[],effici:[0,2],egg:0,either:2,elaps:[],element:2,els:2,elsewher:2,embed:0,empti:2,emptydocu:2,emptypag:2,enabl:2,enable_prerend:2,enable_scribbl:2,encapsul:2,end:[0,2],ensur:0,enter:[0,2],entri:[],entry_ett:2,equival:0,error:0,error_opening_fil:2,esc:0,est_tim:2,estiamt:[],estim:[0,2],estimatedtalktim:2,etc:[0,2],ett:[0,2],even:2,event:[0,2],event_box:2,eventbox:2,everyth:2,evt:2,exampl:[0,2],exceed:[],except:2,execut:0,exist:[0,2],exit:2,expected_widget:2,experi:0,explicit:2,express:2,extens:2,extra:[],extract:2,extrapol:2,f11:0,factor:0,fade:2,fail:[0,2],fall:[],fallback:2,fals:2,fancier:0,far:2,faster:2,featur:0,feel:0,fetch:2,few:0,file:[1,2],filenam:2,fileopen:[],filepath:2,filesystem:2,fill:2,find:2,first:2,fit:0,flag:[0,2],flash:0,fluidifi:2,folder:0,follow:[0,2],foo:[],forc:2,form:0,format:2,forward:[],frame:2,free:0,freehand:2,from:2,from_color:2,full:2,fullscreen:[0,2],func:[],futur:2,gather:2,gdk:[0,2],gdk_win32_window_get_handl:2,gdkpixbuf:[0,2],gener:[0,2],get:[0,2],get_annot:2,get_annot_act:2,get_aspect_ratio:2,get_callback_handl:2,get_current_pag:2,get_extens:2,get_full_path:2,get_icon_pixbuf:2,get_link_act:2,get_link_at:2,get_locale_dir:2,get_media:2,get_notes_layout:2,get_notes_mod:2,get_plain_layout:2,get_player_control_toolbar:2,get_siz:2,get_style_provid:2,get_ui_resource_fil:2,get_widget_typ:2,get_window_handl:2,getter:2,gettext:2,gir1:0,git:0,github:0,given:2,glade:2,glanc:0,glib8:0,glib:2,gnu:2,gobject:[0,2],going:0,googl:[0,2],got:2,goto_end:2,goto_hom:2,goto_next:2,goto_pag:2,goto_prev:2,gpl:0,gplv2:0,grab:0,graphic:[0,2],great:0,green:2,gtk:[0,2],gtkcellrenderertext:2,gtkentri:2,gui:0,hack:[],handl:0,handler:2,handler_nam:2,happen:2,harmless:2,has:[0,2],has_not:2,have:[1,2],hb_cur:2,hbox:2,height:2,henc:2,here:[0,2],hidden:2,hide:2,hierachyi:2,hierarchi:2,highlight:2,highlight_button:2,his:0,hist_next:2,hist_po:2,hist_prev:2,histori:2,hold:2,home:[0,2],horizont:2,host:0,hover:2,hover_link:2,how:[0,2],http:[0,2],hyperlink:2,icon:[0,2],identifi:2,idientifi:2,idl:2,idle_add:2,ignor:2,imag:2,imagesurfac:2,implement:2,independ:2,index:1,indic:[0,2],infinit:2,info:2,inform:2,inherit:2,ini:0,init:2,initi:2,inlin:[0,2],input:[0,2],insert:2,insid:2,instal:1,instanc:2,instead:2,integ:[],intend:2,intercept:2,interfac:[0,2],intern:2,interpol:2,interv:2,introspect:[0,2],invalid:2,ionari:[],is_ov:2,isn:2,item:2,its:[0,2],itself:2,job:2,json:2,jsondecodeerror:2,jump:0,just:[0,2],keep:2,kei:[0,2],keyboard:0,keystrok:2,kind:2,know:0,known:0,kwd:2,label:[],label_clock:2,label_color:2,label_color_default:2,label_color_ett_info:[],label_color_ett_reach:[],label_color_ett_warn:[],label_cur:2,label_ett:2,label_last:2,label_tim:2,lambda:2,languag:0,laptop:0,laser:[],last:2,later:[0,2],latest:0,layout:2,layout_from_json:2,layout_str:2,lc_messag:0,leaf:2,leaf_widget:2,least:2,leav:2,left:[0,2],len:2,length:2,less:2,level:[0,2],libcairo2:0,libgtk:0,libpoppl:0,librari:0,licens:0,like:0,line:[0,2],linearli:2,link:[0,2],link_typ:2,linux:0,list:[0,2],list_attribut:2,list_icon:2,littl:0,load:2,load_color_from_css:2,load_icon:2,load_point:2,load_ui:2,load_widget:2,load_window_layout:2,local:[0,2],locat:2,lock:2,loop:2,lower:0,mac:0,machin:0,made:2,mai:[0,2],main:[0,2],maintain:0,make:[0,2],make_cwin:2,make_pwin:2,manag:0,mandatori:2,mani:0,manual:2,map:2,margin:2,max:2,max_pag:2,max_page_numb:2,maxim:2,maximum:2,mean:2,meaning:2,meant:2,media:2,media_id:2,mediaplay:2,memori:0,menu:[0,2],menu_about:2,mess:2,messag:0,method:2,microsoft:0,middl:2,might:[0,2],mime:2,mime_typ:2,mimetyp:2,miniatur:2,minut:[],miss:[0,2],mix:0,mode:2,modifi:[0,2],modul:1,moment:2,monitor:2,more:[0,2],more_act:2,motion:2,mous:[0,2],mouse_pos_in_pag:2,move:2,move_to_end:2,movement:2,movi:2,movie_zon:2,msgfmt:0,msi:0,msvcp100:0,much:[0,2],multi:2,multipl:2,must:2,must_dis:2,name:[0,2],nameerror:2,nativ:0,nav_scribbl:2,navig:[0,2],nb_page:2,necessari:[0,2],need:2,neither:2,new_doc:2,next:[0,2],next_button:2,next_pag:2,nice:2,node:2,non:2,none:2,nor:2,normal:2,note:[0,2],notes_layout:2,notes_mod:2,noth:2,notifi:[],notify_label_ev:[],notify_page_chang:[],now:2,num_pag:2,number:[0,2],obj:2,object:2,occur:2,off_rend:2,offscreenwindow:2,often:0,on_click:2,on_configure_annot:2,on_configure_da:2,on_configure_win:2,on_drag_drop:2,on_draw:2,on_keypress:2,on_label_ett_ev:[],on_label_ett_keypress:[],on_label_ev:2,on_navig:2,on_page_chang:2,on_pane_ev:2,on_scrol:2,on_spin_nav:[],on_window_state_ev:2,one:2,ones:2,onli:[0,2],open:[1,2],opensus:0,option:[0,2],order:2,ordereddict:2,orient:2,origin:0,other:[0,2],otherwis:2,our:2,outdat:2,output:0,outsid:2,over:0,overlai:2,overrid:2,own:[],p_central:2,p_da_cur:2,p_da_next:2,p_da_not:2,p_frame_annot:2,p_frame_cur:2,p_frame_next:2,p_frame_not:2,p_win:2,p_win_fullscreen:[],p_win_maxim:[],packag:[0,1],page:0,page_chang:2,page_nb:2,page_numb:2,page_preview:2,page_preview_nb:2,pagenumb:2,pages_cach:2,pages_numb:2,pair:[],pane:2,pane_handle_po:2,pane_resize_handl:2,parallel:2,paramet:2,parent:2,pars:2,particularli:2,pass:[0,2],path:2,path_to_config:2,paus:2,pdf:[0,2],pdf_content_pag:2,pdf_notes_pag:2,pdf_regular:2,perform:2,pick_fil:2,pixbuf:[0,2],pixel:2,pixmap:2,placeable_widget:2,placehold:2,plai:0,plain:2,plain_layout:2,plan:0,platform:0,play_media:2,player:2,point:2,pointer:[],pointer_hid:2,pointer_off:2,pointer_po:2,pointer_show:2,pop:2,pop_doc:2,pop_scribbl:2,poppler:[0,2],port:2,portabl:[0,2],posit:2,possibl:2,pre:[0,2],prefer:[0,2],prepar:2,prerequisit:0,present:[0,2],press:[0,2],prev_button:2,prevent:2,preview:[0,2],previou:2,probabl:2,problem:2,process:2,program:2,projector:0,properti:2,proport:2,provid:2,pure:2,put:0,pygi:0,pygobject3:0,pygobject:0,python2:2,python3:[0,2],python:[1,2],queue:2,radio:2,radiomenuitem:2,rais:2,rang:2,ratio:2,reach:2,react:2,read:[0,2],reader:0,realli:[0,2],rearrang:2,receiv:2,recent:2,recent_docu:2,recent_menu:2,recentchoosermenu:2,recogn:2,rect:2,rectangl:2,recurs:2,recursive_unicode_to_str:2,red:2,redistribut:0,redraw:2,redraw_current_slid:2,redraw_pan:2,redraw_timeout:2,refer:2,region:2,regist:2,register_callback:[],regular:2,rel:[0,2],relat:2,relative_marg:[],relative_margin:2,releas:[0,2],reli:0,remain:2,remark:0,rememb:2,remix:2,remov:2,remove_on_exit:2,render:[0,2],render_cairo:2,render_point:2,replac:[0,2],replace_layout:2,replace_media_overlai:2,repo:0,repositori:2,reprens:2,repres:2,request:2,requir:[],reset:2,reset_tim:2,resiz:[0,2],resize_pan:2,resize_widget:2,resolv:2,resourc:2,resource_nam:2,resp:2,respect:[],restore_current_label:[],restore_current_label_ett:[],restore_label:2,result:2,retreiv:2,retriev:2,retructur:2,rgba:2,right:2,root:0,rst:[0,2],run:[0,2],runtim:2,safeti:2,said:2,same:[0,2],save:[0,2],save_and_quit:2,save_config:2,scale:2,schedul:2,scheme:2,schnouki:0,screen:0,screensav:2,scribbl:[],scribble_c_da:2,scribble_c_eb:2,scribble_color:2,scribble_draw:2,scribble_list:2,scribble_overlai:2,scribble_p_da:2,scribble_p_eb:2,scribble_p_fram:2,scribble_width:2,scribbler:2,scribbling_mod:2,scroll:[0,2],scrollable_treelist:2,scrolled_window:2,second:[0,2],see:[0,2],seem:2,select:[0,2],selectiondata:2,self:2,sens:2,sent:2,separ:[0,2],serv:2,set:[0,2],set_cursor:2,set_fil:2,set_last:2,set_screensav:2,set_widget_typ:2,setter:2,setup:[],setup_screen:2,setup_scribbl:[],setuptool:0,sever:2,share:[0,2],shell:0,ship:0,shortcut:[0,2],shortcut_kei:2,should:[0,2],show:2,show_annot:2,show_bigbutton:2,show_control:2,show_point:2,shown:2,side:2,signal:2,signal_connector:2,signal_nam:2,signal_resolv:2,similar:2,simpl:2,simpli:0,sinc:2,singl:2,size:[0,2],slide:0,slider:2,sluggish:2,softwar:0,solut:2,some:[0,2],someth:2,sort:2,sourc:2,specif:[0,2],specifi:2,speed:2,sphinx:[0,2],spin:[0,2],spin_cur:2,spinbutton:2,spinner:2,split:2,stackoverflow:2,start:[0,2],start_edit:2,start_editing_page_numb:2,start_en:2,start_tim:2,startup:2,state:2,statu:2,step:2,still:2,stop:2,stop_edit:2,stop_editing_est_tim:2,stop_editing_page_numb:2,stop_editing_slid:[],stop_editing_tim:[],store:2,str:2,string:[0,2],stroke:2,structur:2,stuff:2,style:[0,2],style_context:2,stylecontext:2,suffix:0,sum:2,supplementari:2,support:[0,2],suppos:2,sure:[0,2],surfac:2,surface_cach:2,surface_s:2,surface_typ:2,suspend:2,swap:0,swap_docu:2,swap_label_for_entri:2,swap_screen:2,switch_annot:2,switch_bigbutton:2,switch_blank:2,switch_fullscreen:2,switch_mod:2,switch_paus:2,switch_scribbl:2,syntax:0,system:0,take:0,talk:0,talk_tim:[],talktim:2,target:2,tell:2,temp_fil:2,templat:0,temporari:2,term:0,test:0,text:[0,2],than:2,thei:[0,2],them:[0,2],thi:[0,2],those:0,though:0,thread:2,threadsaf:2,through:[0,2],thu:2,tick:0,time:0,timecount:2,timelabelcolor:2,timeout_add:2,timer:2,timestamp:2,to_color:2,togeth:0,toggl:[0,2],toggle_point:2,toggle_scribbl:2,toggle_start:2,too:[0,2],tool:2,toolbar:2,toolbutton:2,toolkit:0,top:2,top_widget:2,touch:2,track:2,track_click:2,track_mot:2,track_point:2,track_scribbl:2,transfer:2,transform:2,translat:[1,2],tree:2,trigger:2,tupl:2,twhich:2,two:[0,2],type:[0,2],typelib:0,typic:[],ubuntu:0,undefin:2,under:[0,2],undo:2,unexpect:2,unicod:2,uniqu:2,unlik:0,unpaus:2,until:2,unus:2,updat:2,update_color:2,update_frame_posit:2,update_notes_layout:2,update_page_numb:2,update_plain_layout:2,update_tim:2,update_time_color:2,update_width:2,uppercas:2,uri:2,usag:1,use:[0,2],used:[0,2],useful:2,user:0,user_data:2,using:[0,2],usr:2,usual:[0,2],val:2,valid:[0,2],validate_layout:2,valu:2,valueerror:2,variou:0,vbox:2,veri:2,version:0,vertic:2,via:2,video:0,view:2,visit:2,vlc:0,wai:2,want:[0,2],warn:2,well:[0,2],were:2,what:1,when:[],where:0,whether:2,which:[0,2],whole:[0,2],whose:2,widget_layout_to_tre:2,widget_nam:2,width:2,wiget:2,win32:2,window:[0,2],winow:2,within:2,without:[0,2],work:2,would:0,wrap:2,write:0,written:0,wrong:2,wtype:2,x64:0,x86:0,xalign:2,xml:2,yalign:2,yet:2,you:1,your:0,zypper:0},titles:["What is Pympress?","Welcome to pympress\u2019s documentation!","Pympress package"],titleterms:{"abstract":2,"function":[0,2],Using:0,annot:2,backend:2,binari:0,cach:2,can:2,clock:2,config:2,configur:2,content:1,contribut:0,current:2,cursor:2,depend:0,displai:2,document:[1,2],draw:2,edit:2,editable_label:2,elaps:2,emul:2,entri:2,extra:2,fanci:2,file:0,from:0,gui:2,hack:[],handl:2,have:0,indic:1,instal:0,label:2,laser:2,manag:2,modul:2,number:[],open:0,out:2,packag:2,page:2,page_numb:[],pip:0,plai:2,pointer:2,prerend:2,pympress:[0,1,2],python:0,screen:2,scribbl:2,slide:2,softwar:2,sourc:0,surfacecach:2,swap:2,tabl:1,talk:2,talk_tim:2,time:2,translat:0,ui_build:2,usag:0,user:2,util:2,variou:2,video:2,vlc:2,vlcvideo:2,welcom:1,what:0,when:2,where:2,widget:2,you:0}})
\ No newline at end of file
+Search.setIndex({docnames:["README","index","pympress"],envversion:53,filenames:["README.md","index.rst","pympress.md"],objects:{"pympress.builder":{Builder:[2,1,1,""]},"pympress.builder.Builder":{connect_signals:[2,2,1,""],get_callback_handler:[2,2,1,""],list_attributes:[2,2,1,""],load_ui:[2,2,1,""],load_widgets:[2,2,1,""],replace_layout:[2,2,1,""],signal_connector:[2,2,1,""],signal_resolver:[2,2,1,""]},"pympress.config":{Config:[2,1,1,""],layout_from_json:[2,5,1,""],recursive_unicode_to_str:[2,5,1,""]},"pympress.config.Config":{get_notes_layout:[2,2,1,""],get_plain_layout:[2,2,1,""],load_window_layouts:[2,2,1,""],notes_layout:[2,3,1,""],path_to_config:[2,4,1,""],placeable_widgets:[2,3,1,""],plain_layout:[2,3,1,""],save_config:[2,2,1,""],toggle_start:[2,2,1,""],update_notes_layout:[2,2,1,""],update_plain_layout:[2,2,1,""],validate_layout:[2,2,1,""],widget_layout_to_tree:[2,2,1,""]},"pympress.document":{Document:[2,1,1,""],EmptyDocument:[2,1,1,""],EmptyPage:[2,1,1,""],Link:[2,1,1,""],Page:[2,1,1,""],fileopen:[2,5,1,""],get_extension:[2,5,1,""]},"pympress.document.Document":{"goto":[2,2,1,""],cleanup_media_files:[2,2,1,""],create:[2,4,1,""],cur_page:[2,3,1,""],current_page:[2,2,1,""],doc:[2,3,1,""],get_full_path:[2,2,1,""],goto_end:[2,2,1,""],goto_home:[2,2,1,""],goto_next:[2,2,1,""],goto_prev:[2,2,1,""],has_notes:[2,2,1,""],hist_next:[2,2,1,""],hist_pos:[2,3,1,""],hist_prev:[2,2,1,""],history:[2,3,1,""],nb_pages:[2,3,1,""],next_page:[2,2,1,""],notes:[2,3,1,""],page:[2,2,1,""],page_change:[2,2,1,""],pages_cache:[2,3,1,""],pages_number:[2,2,1,""],path:[2,3,1,""],play_media:[2,2,1,""],remove_on_exit:[2,2,1,""],start_editing_page_number:[2,2,1,""],temp_files:[2,3,1,""]},"pympress.document.EmptyDocument":{page:[2,2,1,""]},"pympress.document.EmptyPage":{can_render:[2,2,1,""],render_cairo:[2,2,1,""]},"pympress.document.Link":{follow:[2,2,1,""],is_over:[2,2,1,""],x1:[2,3,1,""],x2:[2,3,1,""],y1:[2,3,1,""],y2:[2,3,1,""]},"pympress.document.Page":{annotations:[2,3,1,""],can_render:[2,2,1,""],get_annot_action:[2,2,1,""],get_annotations:[2,2,1,""],get_aspect_ratio:[2,2,1,""],get_link_action:[2,2,1,""],get_link_at:[2,2,1,""],get_media:[2,2,1,""],get_size:[2,2,1,""],links:[2,3,1,""],medias:[2,3,1,""],number:[2,2,1,""],page:[2,3,1,""],page_nb:[2,3,1,""],parent:[2,3,1,""],ph:[2,3,1,""],pw:[2,3,1,""],render_cairo:[2,2,1,""]},"pympress.editable_label":{EditableLabel:[2,1,1,""],EstimatedTalkTime:[2,1,1,""],PageNumber:[2,1,1,""]},"pympress.editable_label.EditableLabel":{cancel:[2,2,1,""],editing:[2,3,1,""],event_box:[2,3,1,""],more_actions:[2,2,1,""],on_keypress:[2,2,1,""],on_label_event:[2,2,1,""],restore_label:[2,2,1,""],shortcut_key:[2,3,1,""],start_editing:[2,2,1,""],stop_editing:[2,2,1,""],swap_label_for_entry:[2,2,1,""],validate:[2,2,1,""]},"pympress.editable_label.EstimatedTalkTime":{delayed_callback_connection:[2,2,1,""],eb_ett:[2,3,1,""],entry_ett:[2,3,1,""],est_time:[2,3,1,""],label_ett:[2,3,1,""],label_time:[2,3,1,""],more_actions:[2,2,1,""],restore_label:[2,2,1,""],stop_editing_page_number:[2,2,1,""],swap_label_for_entry:[2,2,1,""],validate:[2,2,1,""]},"pympress.editable_label.PageNumber":{cancel:[2,2,1,""],eb_cur:[2,3,1,""],goto_page:[2,2,1,""],hb_cur:[2,3,1,""],label_cur:[2,3,1,""],label_last:[2,3,1,""],max_page_number:[2,3,1,""],more_actions:[2,2,1,""],on_scroll:[2,2,1,""],page_change:[2,2,1,""],restore_label:[2,2,1,""],set_last:[2,2,1,""],spin_cur:[2,3,1,""],stop_editing_est_time:[2,2,1,""],swap_label_for_entry:[2,2,1,""],update_page_numbers:[2,2,1,""],validate:[2,2,1,""]},"pympress.extras":{Annotations:[2,1,1,""],Cursor:[2,1,1,""],Media:[2,1,1,""]},"pympress.extras.Annotations":{add_annotations:[2,2,1,""],annotation_renderer:[2,3,1,""],on_configure_annot:[2,2,1,""],on_scroll:[2,2,1,""],scrollable_treelist:[2,3,1,""],scrolled_window:[2,3,1,""]},"pympress.extras.Cursor":{set_cursor:[2,6,1,""]},"pympress.extras.Media":{c_overlay:[2,3,1,""],play:[2,2,1,""],replace_media_overlays:[2,2,1,""],resize:[2,2,1,""],vlc_support_enabled:[2,4,1,""]},"pympress.pointer":{POINTER_HIDE:[2,7,1,""],POINTER_OFF:[2,7,1,""],POINTER_SHOW:[2,7,1,""],Pointer:[2,1,1,""]},"pympress.pointer.Pointer":{change_pointer:[2,2,1,""],config:[2,3,1,""],load_pointer:[2,2,1,""],pointer:[2,3,1,""],pointer_pos:[2,3,1,""],redraw_current_slide:[2,2,1,""],render_pointer:[2,2,1,""],show_pointer:[2,3,1,""],toggle_pointer:[2,2,1,""],track_pointer:[2,2,1,""]},"pympress.scribble":{Scribbler:[2,1,1,""]},"pympress.scribble.Scribbler":{c_overlay:[2,3,1,""],cache:[2,3,1,""],clear_scribble:[2,2,1,""],disable_scribbling:[2,2,1,""],draw_scribble:[2,2,1,""],enable_scribbling:[2,2,1,""],get_current_page:[2,2,1,""],get_notes_mode:[2,2,1,""],nav_scribble:[2,2,1,""],off_render:[2,3,1,""],on_configure_da:[2,2,1,""],p_central:[2,3,1,""],pop_scribble:[2,2,1,""],pres_highlight:[2,3,1,""],redraw_current_slide:[2,2,1,""],scribble_c_da:[2,3,1,""],scribble_c_eb:[2,3,1,""],scribble_color:[2,3,1,""],scribble_drawing:[2,3,1,""],scribble_list:[2,3,1,""],scribble_overlay:[2,3,1,""],scribble_p_da:[2,3,1,""],scribble_p_eb:[2,3,1,""],scribble_p_frame:[2,3,1,""],scribble_width:[2,3,1,""],scribbling_mode:[2,3,1,""],switch_scribbling:[2,2,1,""],toggle_scribble:[2,2,1,""],track_scribble:[2,2,1,""],update_color:[2,2,1,""],update_width:[2,2,1,""]},"pympress.surfacecache":{OrderedDict:[2,1,1,""],SurfaceCache:[2,1,1,""]},"pympress.surfacecache.OrderedDict":{move_to_end:[2,2,1,""]},"pympress.surfacecache.SurfaceCache":{active_widgets:[2,3,1,""],add_widget:[2,2,1,""],disable_prerender:[2,2,1,""],doc:[2,3,1,""],doc_lock:[2,3,1,""],enable_prerender:[2,2,1,""],get:[2,2,1,""],get_widget_type:[2,2,1,""],locks:[2,3,1,""],max_pages:[2,3,1,""],prerender:[2,2,1,""],renderer:[2,2,1,""],resize_widget:[2,2,1,""],set:[2,2,1,""],set_widget_type:[2,2,1,""],surface_cache:[2,3,1,""],surface_factory:[2,3,1,""],surface_size:[2,3,1,""],surface_type:[2,3,1,""],swap_document:[2,2,1,""]},"pympress.talk_time":{TimeCounter:[2,1,1,""],TimeLabelColorer:[2,1,1,""]},"pympress.talk_time.TimeCounter":{delta:[2,3,1,""],ett:[2,3,1,""],label_clock:[2,3,1,""],label_colorer:[2,3,1,""],label_time:[2,3,1,""],pause:[2,2,1,""],paused:[2,3,1,""],pres_pause:[2,3,1,""],reset_timer:[2,2,1,""],start_time:[2,3,1,""],switch_pause:[2,2,1,""],unpause:[2,2,1,""],update_time:[2,2,1,""]},"pympress.talk_time.TimeLabelColorer":{calc_color:[2,2,1,""],color_map:[2,3,1,""],default_color:[2,2,1,""],label_color_default:[2,3,1,""],label_time:[2,3,1,""],load_color_from_css:[2,2,1,""],update_time_color:[2,2,1,""]},"pympress.ui":{PDF_CONTENT_PAGE:[2,7,1,""],PDF_NOTES_PAGE:[2,7,1,""],PDF_REGULAR:[2,7,1,""],UI:[2,1,1,""]},"pympress.ui.UI":{adjust_frame_position:[2,2,1,""],annotations:[2,3,1,""],blanked:[2,3,1,""],c_da:[2,3,1,""],c_frame:[2,3,1,""],c_win:[2,3,1,""],cache:[2,3,1,""],click_link:[2,2,1,""],close_file:[2,2,1,""],config:[2,3,1,""],doc:[2,3,1,""],error_opening_file:[2,2,1,""],est_time:[2,3,1,""],get_notes_mode:[2,2,1,""],highlight_button:[2,3,1,""],hover_link:[2,2,1,""],laser:[2,3,1,""],make_cwin:[2,2,1,""],make_pwin:[2,2,1,""],medias:[2,3,1,""],menu_about:[2,2,1,""],mouse_pos_in_page:[2,2,1,""],next_button:[2,3,1,""],notes_mode:[2,3,1,""],on_configure_da:[2,2,1,""],on_configure_win:[2,2,1,""],on_drag_drop:[2,2,1,""],on_draw:[2,2,1,""],on_navigation:[2,2,1,""],on_page_change:[2,2,1,""],on_pane_event:[2,2,1,""],on_scroll:[2,2,1,""],on_window_state_event:[2,2,1,""],p_central:[2,3,1,""],p_da_cur:[2,3,1,""],p_da_next:[2,3,1,""],p_da_notes:[2,3,1,""],p_frame_annot:[2,3,1,""],p_frame_cur:[2,3,1,""],p_frame_next:[2,3,1,""],p_frame_notes:[2,3,1,""],p_win:[2,3,1,""],page_number:[2,3,1,""],page_preview:[2,2,1,""],page_preview_nb:[2,3,1,""],pane_handle_pos:[2,3,1,""],pick_file:[2,2,1,""],placeable_widgets:[2,3,1,""],pres_annot:[2,3,1,""],pres_blank:[2,3,1,""],pres_fullscreen:[2,3,1,""],pres_notes:[2,3,1,""],prev_button:[2,3,1,""],recent_document:[2,2,1,""],redraw_current_slide:[2,2,1,""],redraw_panes:[2,2,1,""],redraw_timeout:[2,3,1,""],resize_panes:[2,3,1,""],run:[2,2,1,""],save_and_quit:[2,2,1,""],scribbler:[2,3,1,""],setup_screens:[2,2,1,""],show_annotations:[2,3,1,""],show_bigbuttons:[2,3,1,""],swap_document:[2,2,1,""],swap_screens:[2,2,1,""],switch_annotations:[2,2,1,""],switch_bigbuttons:[2,2,1,""],switch_blanked:[2,2,1,""],switch_fullscreen:[2,2,1,""],switch_mode:[2,2,1,""],talk_time:[2,3,1,""],track_clicks:[2,2,1,""],track_motions:[2,2,1,""],update_frame_position:[2,2,1,""]},"pympress.util":{get_icon_pixbuf:[2,5,1,""],get_locale_dir:[2,5,1,""],get_pympress_meta:[2,5,1,""],get_style_provider:[2,5,1,""],get_ui_resource_file:[2,5,1,""],list_icons:[2,5,1,""],load_icons:[2,5,1,""],set_screensaver:[2,5,1,""]},"pympress.vlcvideo":{VLCVideo:[2,1,1,""],get_window_handle:[2,5,1,""],instance:[2,7,1,""]},"pympress.vlcvideo.VLCVideo":{controls:[2,3,1,""],get_player_control_toolbar:[2,2,1,""],hide:[2,2,1,""],movie_zone:[2,3,1,""],on_click:[2,2,1,""],overlay:[2,3,1,""],play:[2,2,1,""],player:[2,3,1,""],relative_margins:[2,3,1,""],resize:[2,2,1,""],set_file:[2,2,1,""]},pympress:{builder:[2,0,0,"-"],config:[2,0,0,"-"],document:[2,0,0,"-"],editable_label:[2,0,0,"-"],extras:[2,0,0,"-"],pointer:[2,0,0,"-"],scribble:[2,0,0,"-"],surfacecache:[2,0,0,"-"],talk_time:[2,0,0,"-"],ui:[2,0,0,"-"],util:[2,0,0,"-"],vlcvideo:[2,0,0,"-"]}},objnames:{"0":["py","module","Python module"],"1":["py","class","Python class"],"2":["py","method","Python method"],"3":["py","attribute","Python attribute"],"4":["py","staticmethod","Python static method"],"5":["py","function","Python function"],"6":["py","classmethod","Python class method"],"7":["py","data","Python data"]},objtypes:{"0":"py:module","1":"py:class","2":"py:method","3":"py:attribute","4":"py:staticmethod","5":"py:function","6":"py:classmethod","7":"py:data"},terms:{"0_18":0,"0x5555713b0d50":[],"0x55578082c0c0":[],"0x55578093e120":[],"0x55578095e420":[],"0x555780961150":[],"0x555ce42e34c0":[],"0x555ce43f5120":[],"0x556569d014c0":[],"0x556569e11120":[],"0x556569e30420":[],"0x556569e32d50":[],"0x55728dc608c0":[],"0x55728dd71120":[],"0x55728dd90420":[],"0x55728dd96150":[],"0x557ee354dcc0":[],"0x557ee3662120":[],"0x557ee3682420":[],"0x557ee3687150":[],"0x55810e6c0cc0":[],"0x55810e7d0120":[],"0x55810e7f0420":[],"0x55810e7f3550":[],"0x5588e146dcc0":[],"0x5588e1581120":[],"0x5588e15a0420":[],"0x5588e15a6550":[],"0x558a88f6c4c0":[],"0x558a8907b120":[],"0x558a89098420":[],"0x558a8909a150":[],"0x558ba5714cc0":[],"0x558ba5824120":[],"0x558ba5842420":[],"0x558ba5845550":[],"0x558de1fe9240":[],"0x558de20f1120":[],"0x558de2112420":[],"0x558de2116950":[],"0x558f3781d180":[],"0x558f37929120":[],"0x558f37946420":[],"0x558f37949150":[],"0x558fd92be4c0":[],"0x558fd93ce120":[],"0x558fd93ee950":[],"0x558fd93f2420":[],"0x5592775120c0":[],"0x559277625120":[],"0x559277648420":[],"0x55927764c550":[],"0x55a1f3cff4c0":[],"0x55a1f3e10120":[],"0x55a1f3e38420":[],"0x55a1f3e3ad50":[],"0x55a3475148c0":[],"0x55a347625120":[],"0x55a347634420":[],"0x55a347636d50":[],"0x55a3e569b4c0":[],"0x55a3e57a9120":[],"0x55a3e57c4420":[],"0x55a3e57c6950":[],"0x55a5cb97a580":[],"0x55a5cba8a120":[],"0x55a5cbaa8420":[],"0x55a5cbaaad50":[],"0x55a679f2d8c0":[],"0x55a67a03d120":[],"0x55a67a05e420":[],"0x55a67a064150":[],"0x55a9a8f59580":[],"0x55a9a9067120":[],"0x55a9a9088420":[],"0x55a9a908c550":[],"0x55a9b7560cc0":[],"0x55a9b7672120":[],"0x55a9b7682420":[],"0x55a9b7684150":[],"0x55aaece294c0":[],"0x55aaecf3d120":[],"0x55aaecf5c420":[],"0x55aaecf62150":[],"0x55ac60e800c0":[],"0x55ac60f93120":[],"0x55ac60fb2420":[],"0x55ac60fb8150":[],"0x55b3f1a70cc0":[],"0x55b3f1b80120":[],"0x55b3f1ba0420":[],"0x55b3f1ba6150":[],"0x55b5cfc1e8c0":[],"0x55b5cfd2f120":[],"0x55b5cfd38420":[],"0x55b5cfd3a550":[],"0x55b9df9298c0":[],"0x55b9dfa40110":[],"0x55b9dfa5e490":[],"0x55be8cece180":[],"0x55be8cfde120":[],"0x55be8d002420":[],"0x55be8d004d50":[],"0x55cad11254c0":[],"0x55cad1237120":[],"0x55cad1256420":[],"0x55cad1259150":[],"0x55ccd35bc8c0":[],"0x55ccd36cb120":[],"0x55cd41f7c180":[],"0x55cd4208b120":[],"0x55cd420a8420":[],"0x55cd420ad150":[],"0x55d2f49364c0":[],"0x55d2f4a49120":[],"0x55d2f4a5e420":[],"0x55d2f4a6e550":[],"0x55d50d6810c0":[],"0x55d50d793120":[],"0x55d50d7b4420":[],"0x55d50d7b8550":[],"0x55dbb8f3f8c0":[],"0x55dbb9052120":[],"0x55dbb9068420":[],"0x55dbb907a950":[],"0x55de553ca0c0":[],"0x55de554dd120":[],"0x55de554fc420":[],"0x55de554ff950":[],"0x55e0f7918550":[],"0x55e62ca76cc0":[],"0x55e62cb86120":[],"0x55e62cba8950":[],"0x55e62cbaa420":[],"0x55e72f0640c0":[],"0x55e72f178120":[],"0x55e72f18a420":[],"0x55e72f18c550":[],"0x55eb249028c0":[],"0x55eb24a15120":[],"0x55eb24a34420":[],"0x55eb24a3a550":[],"0x55ef8163b0c0":[],"0x55ef8174d120":[],"0x55ef8176a420":[],"0x55ef81770150":[],"0x55f03eca28c0":[],"0x55f03edb3120":[],"0x55f03edd6420":[],"0x55f03edda550":[],"0x55fb43808580":[],"0x55fb43915120":[],"0x55fb43924420":[],"0x55fb43927550":[],"0x5600f48084c0":[],"0x5600f4919120":[],"0x5600f4928420":[],"0x5600f492a150":[],"0x5602c47d04c0":[],"0x5602c48e4120":[],"0x5602c4904950":[],"0x5602c4908420":[],"0x560484c880c0":[],"0x560484d9e110":[],"0x560484dac490":[],"0x560806368cc0":[],"0x560806478120":[],"0x560806498420":[],"0x56080649a150":[],"0x56090cb09580":[],"0x56090cc19120":[],"0x56090cc2e420":[],"0x56090cc30550":[],"0x560bf093bcc0":[],"0x560bf0a50120":[],"0x560bf0a70420":[],"0x560bf0a75150":[],"0x560f1506d8c0":[],"0x560f15180120":[],"0x560f15192550":[],"0x560f151a2420":[],"0x5612c1a8bcc0":[],"0x5612c1b9d120":[],"0x5612c1bbdd50":[],"0x5612c1bc0420":[],"0x56177a01c580":[],"0x56177a129120":[],"0x56177a138420":[],"0x56177a13ad50":[],"0x561aeebf8c00":2,"0x561aeed13110":2,"0x561aeed32490":2,"0x561b59af60c0":[],"0x561b59c05120":[],"0x561b59c2e420":[],"0x561b59c30150":[],"0x561b6f866cc0":[],"0x561b6f97a120":[],"0x561b6f99a420":[],"0x561b6f99e550":[],"0x561dd69668c0":[],"0x561dd6a77120":[],"0x561dd6a86420":[],"0x561dd6a88150":[],"0x56217c5c08c0":[],"0x56217c6cf120":[],"0x56217c6e4420":[],"0x56217c6f7550":[],"0x562505513580":[],"0x56250561f120":[],"0x56250563e420":[],"0x562505640150":[],"0x56265cff1d20":[],"0x56265d239140":[],"0x562970424d80":[],"0x562970532120":[],"0x562970550420":[],"0x562970553550":[],"0x562d2bb214c0":[],"0x562d2bc35120":[],"0x562d2bc54420":[],"0x562d2bc58d50":[],"0x5643510dc8c0":[],"0x5643511ee120":[],"0x56435120c420":[],"0x56435120ed50":[],"0x5644c02fb0c0":[],"0x5644c0410120":[],"0x5644c0430420":[],"0x5644c0433150":[],"0x5649aa0ef4c0":[],"0x5649aa202120":[],"0x5649aa222420":[],"0x5649aa227150":[],"0x564f3dbcd8c0":[],"0x564f3dcde120":[],"0x564f3dcfe420":[],"0x564f3dd03150":[],"0x5862e80":[],"0x5a5d6c0":[],"0x5a870f0":[],"0x652bcf0":[],"0x68f6a20":[],"0x69004c8":[],"0x7efca0055090":[],"0x7efca005ddc8":[],"0x7efca0066d38":[],"0x7efca0315d38":[],"0x7efd5519cfc0":[],"0x7efd5519ef30":[],"0x7efd55b3cf78":[],"0x7efd55b5f360":[],"0x7f06c5825f78":[],"0x7f06c5848360":[],"0x7f0888119e10":[],"0x7f0888122510":[],"0x7f08881795a0":[],"0x7f088818b870":[],"0x7f0f6123eee8":[],"0x7f0f612465e8":[],"0x7f0f62386678":[],"0x7f0f6239c948":[],"0x7f0f88fb2048":[],"0x7f0f88fc2af8":[],"0x7f0f88fc7ca8":[],"0x7f0f897aad38":[],"0x7f147a245e58":[],"0x7f147a24d558":[],"0x7f147abb4630":[],"0x7f147abc7b88":[],"0x7f19a382da68":[],"0x7f19a3841240":[],"0x7f19a3848630":[],"0x7f19a3ff2678":[],"0x7f1c258bc048":[],"0x7f1c258cbaf8":[],"0x7f1c258d1ca8":[],"0x7f1c260b4d38":[],"0x7f20b2f2d870":[],"0x7f20b2f3b318":[],"0x7f20b2f3bea0":[],"0x7f20b37701f8":[],"0x7f20c4c0a3f0":[],"0x7f20c53fc6c0":[],"0x7f20c7736168":[],"0x7f21b0335e58":[],"0x7f21b0340240":[],"0x7f21b1477240":[],"0x7f21b1495990":[],"0x7f2558727f30":[],"0x7f2558748798":[],"0x7f265c3f73a8":[],"0x7f2bc3716fc0":[],"0x7f2bc3725bd0":[],"0x7f2bc3727948":[],"0x7f2bc3752870":[],"0x7f2c90040e10":[],"0x7f2c90048510":[],"0x7f2c9009d5e8":[],"0x7f2c900b2870":[],"0x7f2f9f481dc8":[],"0x7f2f9f48a4c8":[],"0x7f2fa402b558":[],"0x7f2fa403d828":[],"0x7f3061655288":[],"0x7f306165b678":[],"0x7f3062000630":[],"0x7f3062014d80":[],"0x7f32da603240":[],"0x7f32da603f30":[],"0x7f32db6f9e58":[],"0x7f32db7215a0":[],"0x7f3319f45fc0":[],"0x7f3319f58af8":[],"0x7f3319f5dca8":[],"0x7f331a741cf0":[],"0x7f33aa4d1d38":[],"0x7f33aa4e0900":[],"0x7f33aa4e94c8":[],"0x7f33ab5e5678":[],"0x7f3efebc9bd0":[],"0x7f3efebdb168":[],"0x7f3efebe2750":[],"0x7f3eff3c0828":[],"0x7f421c1c6fc0":[],"0x7f421c1d4d80":[],"0x7f421c1dbca8":[],"0x7f421c229d38":[],"0x7f441f347e58":[],"0x7f441f34f558":[],"0x7f44244a4678":[],"0x7f44244ba8b8":[],"0x7f52f92bf708":[],"0x7f52f92c2678":[],"0x7f52fa480678":[],"0x7f52fa495990":[],"0x7f55c0022e10":[],"0x7f55c002b510":[],"0x7f55c00825a0":[],"0x7f55c0094870":[],"0x7f561807eea0":[],"0x7f5618086558":[],"0x7f5618571678":[],"0x7f5618588900":[],"0x7f5716b48090":[],"0x7f5716b57b40":[],"0x7f5716b5cca8":[],"0x7f5717340d38":[],"0x7f5be16da9d8":[],"0x7f5be16dbdc8":[],"0x7f5be284fe10":[],"0x7f5be28770d8":[],"0x7f5ffcc14240":[],"0x7f5ffcc14f78":[],"0x7f5ffdd0be58":[],"0x7f5ffdd305e8":[],"0x7f6561f261f8":[],"0x7f6561f26f30":[],"0x7f656305ee58":[],"0x7f65630855a0":[],"0x7f743dfb4ea0":[],"0x7f743dfc7438":[],"0x7f743dfccab0":[],"0x7f743e7b4b88":[],"0x7f7571f96048":[],"0x7f7571f99708":[],"0x7f75728ff708":[],"0x7f7572915ab0":[],"0x7f7ca403dea0":[],"0x7f7ca4045558":[],"0x7f7ca40dc630":[],"0x7f7ca40f3900":[],"0x7f7e7d007120":[],"0x7f7e7d00d7e0":[],"0x7f7e7d971828":[],"0x7f7e7d98cc18":[],"0x7f7f206e55a0":[],"0x7f7f206fa5a0":[],"0x7f7f20ea5fc0":[],"0x7f829404d120":[],"0x7f829406d798":[],"0x7f8294080168":[],"0x7f8294080dc8":[],"0x7f8535ae91f8":[],"0x7f8535aef5a0":[],"0x7f8536492630":[],"0x7f85364a88b8":[],"0x7f86d41bfdc8":[],"0x7f86d41c74c8":[],"0x7f86d49265a0":[],"0x7f86d4938b88":[],"0x7f8fbc1d4990":[],"0x7f8fbc1e6678":[],"0x7f8fbc1eb5e8":[],"0x7f8fbcb52630":[],"0x7f9748c623a8":[],"0x7f9cc2080e58":[],"0x7f9cc20943f0":[],"0x7f9cc2099ab0":[],"0x7f9cc2880b40":[],"0x7f9e20898fc0":[],"0x7f9e208abab0":[],"0x7f9e208b1c18":[],"0x7f9e21094d38":[],"0x7f9f095c1870":2,"0x7f9f095dde10":2,"0x7f9f096661f8":2,"0x7fa06d674870":[],"0x7fa06d680dc8":[],"0x7fa06d6894c8":[],"0x7fa06de78558":[],"0x7fa0840f3438":[],"0x7fa0840f75e8":[],"0x7fa08418d630":[],"0x7fa0841a1948":[],"0x7fa98a661240":[],"0x7fa98a667630":[],"0x7fa98b00a630":[],"0x7fa98b01f900":[],"0x7fad427fce10":[],"0x7fad4280aab0":[],"0x7fad4280e7e0":[],"0x7fad43035750":[],"0x7fae878b9ca8":[],"0x7fae878c7870":[],"0x7fae878cd438":[],"0x7fae8c24e630":[],"0x7fb6413b2e58":[],"0x7fb6413bca20":[],"0x7fb6413c4798":[],"0x7fb641b71708":[],"0x7fbb9e3388b8":[],"0x7fbb9e34e678":[],"0x7fbb9e3543f0":[],"0x7fbb9eb3d4c8":[],"0x7fbdb13bfcf0":[],"0x7fbdb1d9dcf0":[],"0x7fbdb1dbe120":[],"0x7fbdb1dc4f78":[],"0x7fbdc1b6fea0":[],"0x7fbdc1b79828":[],"0x7fbdc1b7eab0":[],"0x7fbdc23a9750":[],"0x7fc00c0466c0":[],"0x7fc00c04b2d0":[],"0x7fc00c0ee240":[],"0x7fc00c0f8a68":[],"0x7fc0a0101f30":[],"0x7fc0a01095e8":[],"0x7fc0a06c46c0":[],"0x7fc0a06db990":[],"0x7fc2ccd2d090":[],"0x7fc2ccd35dc8":[],"0x7fc2ccd3dd38":[],"0x7fc2cd524d38":[],"0x7fcb48730048":[],"0x7fcb48738dc8":[],"0x7fcb4873fd38":[],"0x7fcb48f28d38":[],"0x7fd182278ea0":[],"0x7fd18227f5a0":[],"0x7fd1833bf678":[],"0x7fd1833d5948":[],"0x7fd92e91bdc8":[],"0x7fd92e92e360":[],"0x7fd92e931990":[],"0x7fd934226a20":[],"0x7feb68076048":[],"0x7feb68082e58":[],"0x7feb68084dc8":[],"0x7feb6863ccf0":[],"0x7fedf412d090":[],"0x7fedf4135dc8":[],"0x7fedf413dcf0":[],"0x7fedf418cd38":[],"0x7ff9fad0d288":[],"0x7ff9fad22990":[],"0x7ffabac82a68":[],"0x7ffabac917e0":[],"0x7ffabac97750":[],"0x7ffabb4476c0":[],"1_0":0,"2_0":0,"3_0":0,"boolean":2,"case":2,"class":2,"default":[0,2],"final":0,"float":2,"function":1,"goto":2,"import":2,"int":2,"long":2,"new":[0,2],"public":0,"return":2,"static":2,"switch":2,"true":2,"try":[0,2],"while":2,For:0,Its:2,The:[0,2],Used:2,Uses:2,__init__:2,abl:0,about:[0,2],abov:0,absolut:2,access:2,accident:2,accordingli:2,action:2,actiontyp:2,activ:2,active_widget:2,actual:2,add:[0,2],add_annot:2,add_widget:2,added:2,adding:2,adjust:[0,2],adjust_frame_posit:2,afraid:0,after:2,afterward:2,align:2,all:[0,2],allow:[0,2],almost:2,along:[0,2],alpha:2,alreadi:[0,2],also:[0,2],alwai:2,amd64:0,ani:[0,2],annot:0,annotation_render:2,annotatiosn:[],anoth:2,appdata:0,appear:[0,2],appli:[0,2],apt:0,area:2,arg:2,argument:2,around:2,ask:[0,2],aspect:2,aspectfram:2,associ:2,assum:[0,2],atcion:2,attr_list:2,attribut:2,avail:[0,2],avoid:2,back:2,bad:2,bar:0,base:2,base_target:2,basenam:2,beamer:0,been:[0,2],befor:2,begin:2,behaviour:2,being:2,belong:2,below:2,better:2,between:[0,2],beyond:2,big:2,binari:1,bind:0,bit:0,blank:2,blue:2,bool:2,both:[0,2],bound:2,box:[0,2],bring:2,build:2,builder:2,builderconnectfunc:2,built:2,button:[0,2],c_da:2,c_frame:2,c_overlai:2,c_win:2,c_win_fullscreen:[],cach:0,cairo:[0,2],cairo_context:2,cairocontext:2,calc_color:2,call:2,callback:2,calld:2,can:0,can_rend:2,cancel:[0,2],canva:2,capabl:2,captur:2,casa:2,cast:2,cellrenderertext:2,center:0,chang:[0,2],change_point:2,charact:2,check:[0,2],check_item:2,checkmenuitem:2,child:2,children:2,choic:0,choos:0,chooser:2,cimbali:0,circular:2,class_nam:2,classl:[],classmethod:2,cleanup_media_fil:2,clear:2,clear_scribbl:2,click:[0,2],click_link:2,clickabl:2,clock:[],clone:0,close_fil:2,closest:2,code:[0,2],collect:2,color:[0,2],color_map:2,colorbutton:2,com:[0,2],come:0,command:[0,2],comment:2,compat:2,complet:2,comput:2,conccur:2,concern:2,config:0,configpars:2,configur:0,connect:2,connect_object:2,connect_sign:2,connectflag:2,connector:2,consid:2,consol:0,consum:[0,2],contain:[0,2],content:[0,2],context:2,contraint:2,contribut:1,control:2,convent:0,convert:2,coordin:2,copi:2,correct:2,correspond:2,counter:2,cours:2,crash:2,creat:[0,2],create_similar:2,css:2,cssprovid:2,ctrl:[0,2],ctrl_press:2,ctype:2,cur_nb:2,cur_pag:2,current:0,current_pag:2,cursor:[],cursor_nam:2,data:2,deal:2,decod:2,default_color:2,default_point:[],defin:2,definit:2,delai:2,delayed_callback_connect:2,delet:2,delta:2,depend:[1,2],depth:2,descript:2,design:[0,2],desir:2,destin:2,determin:2,dialog:2,dict:2,dictionari:2,differ:[0,2],dimens:2,diplai:[],direct:2,directli:2,directori:2,disabl:2,disable_prerend:2,disable_scribbl:2,displai:0,distribut:0,dll:0,do_key_press_ev:2,doc:[0,2],doc_lock:2,docpath:2,docstr:2,document:0,doe:2,doesn:[0,2],don:[0,2],done:[0,2],down:0,download:0,downsid:2,drag:[0,2],drag_context:2,dragcontext:2,draw:0,draw_scribbl:2,drawingarea:2,drawn:2,drop:2,dtype:2,dual:0,due:2,dummi:2,durat:0,dynam:2,each:2,easi:2,easili:0,eb_cur:2,eb_ett:2,edit:[],editablelabel:2,editing_cur:[],editing_cur_ett:[],effici:[0,2],egg:0,either:2,elaps:[],element:2,els:2,elsewher:2,embed:0,empti:2,emptydocu:2,emptypag:2,enabl:2,enable_prerend:2,enable_scribbl:2,encapsul:2,end:[0,2],ensur:0,enter:[0,2],entri:[],entry_ett:2,equival:0,error:0,error_opening_fil:2,esc:0,est_tim:2,estiamt:[],estim:[0,2],estimatedtalktim:2,etc:[0,2],ett:[0,2],even:2,event:[0,2],event_box:2,eventbox:2,everyth:2,evt:2,exampl:[0,2],exceed:[],except:2,execut:0,exist:[0,2],exit:2,expected_widget:2,experi:0,explicit:2,express:2,extens:2,extra:[],extract:2,extrapol:2,f11:0,factor:0,fade:2,fail:[0,2],fall:[],fallback:2,fals:2,fancier:0,far:2,faster:2,featur:0,feel:0,fetch:2,few:0,file:[1,2],filenam:2,fileopen:2,filepath:2,filesystem:2,fill:2,find:2,first:2,fit:0,flag:[0,2],flash:0,fluidifi:2,folder:0,follow:[0,2],foo:[],forc:2,form:0,format:2,forward:[],frame:2,free:0,freehand:2,from:2,from_color:2,full:2,fullscreen:[0,2],func:[],futur:2,gather:2,gdk:[0,2],gdk_win32_window_get_handl:2,gdkpixbuf:[0,2],gener:[0,2],get:[0,2],get_annot:2,get_annot_act:2,get_aspect_ratio:2,get_callback_handl:2,get_current_pag:2,get_extens:2,get_full_path:2,get_icon_pixbuf:2,get_link_act:2,get_link_at:2,get_locale_dir:2,get_media:2,get_notes_layout:2,get_notes_mod:2,get_plain_layout:2,get_player_control_toolbar:2,get_pympress_meta:2,get_siz:2,get_style_provid:2,get_ui_resource_fil:2,get_widget_typ:2,get_window_handl:2,getter:2,gettext:2,gir1:0,git:0,github:0,given:2,glade:2,glanc:0,glib8:0,glib:2,gnu:2,gobject:[0,2],going:0,googl:[0,2],got:2,goto_end:2,goto_hom:2,goto_next:2,goto_pag:2,goto_prev:2,gpl:0,gplv2:0,grab:0,graphic:[0,2],great:0,green:2,gtk:[0,2],gtkcellrenderertext:2,gtkentri:2,gui:0,hack:[],handl:0,handler:2,handler_nam:2,happen:2,harmless:2,has:[0,2],has_not:2,have:[1,2],hb_cur:2,hbox:2,height:2,henc:2,here:[0,2],hidden:2,hide:2,hierachyi:2,hierarchi:2,highlight:2,highlight_button:2,his:0,hist_next:2,hist_po:2,hist_prev:2,histori:2,hold:2,home:[0,2],horizont:2,host:0,hover:2,hover_link:2,how:[0,2],http:[0,2],hyperlink:2,icon:[0,2],identifi:2,idientifi:2,idl:2,idle_add:2,ignor:2,imag:2,imagesurfac:2,implement:2,independ:2,index:1,indic:[0,2],infinit:2,info:2,inform:2,inherit:2,ini:0,init:2,initi:2,inlin:[0,2],input:[0,2],insert:2,insid:2,instal:1,instanc:2,instead:2,integ:[],intend:2,intercept:2,interfac:[0,2],intern:2,interpol:2,interv:2,introspect:[0,2],invalid:2,ionari:[],is_ov:2,isn:2,item:2,its:[0,2],itself:2,job:2,json:2,jsondecodeerror:2,jump:0,just:[0,2],keep:2,kei:[0,2],keyboard:0,keystrok:2,kind:2,know:0,known:0,kwd:[],label:[],label_clock:2,label_color:2,label_color_default:2,label_color_ett_info:[],label_color_ett_reach:[],label_color_ett_warn:[],label_cur:2,label_ett:2,label_last:2,label_tim:2,lambda:2,languag:0,laptop:0,laser:[],last:2,later:[0,2],latest:0,layout:2,layout_from_json:2,layout_str:2,lc_messag:0,leaf:2,leaf_widget:2,least:2,leav:2,left:[0,2],len:2,length:2,less:2,level:[0,2],libcairo2:0,libgtk:0,libpoppl:0,librari:0,licens:0,like:0,line:[0,2],linearli:2,link:[0,2],link_typ:2,linux:0,list:[0,2],list_attribut:2,list_icon:2,littl:0,load:2,load_color_from_css:2,load_icon:2,load_point:2,load_ui:2,load_widget:2,load_window_layout:2,local:[0,2],locat:2,lock:2,loop:2,lower:0,mac:0,machin:0,made:2,mai:[0,2],main:[0,2],maintain:0,make:[0,2],make_cwin:2,make_pwin:2,manag:0,mandatori:2,mani:0,manual:2,map:2,margin:2,max:2,max_pag:2,max_page_numb:2,maxim:2,maximum:2,mean:2,meaning:2,meant:2,media:2,media_id:2,mediaplay:2,memori:0,menu:[0,2],menu_about:2,mess:2,messag:0,metadata:2,method:2,microsoft:0,middl:2,might:[0,2],mime:2,mime_typ:2,mimetyp:2,miniatur:2,minut:[],miss:[0,2],mix:0,mode:2,modifi:[0,2],modul:1,moment:2,monitor:2,more:[0,2],more_act:2,motion:2,mous:[0,2],mouse_pos_in_pag:2,move:2,move_to_end:2,movement:2,movi:2,movie_zon:2,msgfmt:0,msi:0,msvcp100:0,much:[0,2],multi:2,multipl:2,must:2,must_dis:2,name:[0,2],nameerror:2,nativ:0,nav_scribbl:2,navig:[0,2],nb_page:2,necessari:[0,2],need:2,neither:2,new_doc:2,next:[0,2],next_button:2,next_pag:2,nice:2,node:2,non:2,none:2,nor:2,normal:2,note:[0,2],notes_layout:2,notes_mod:2,noth:2,notifi:[],notify_label_ev:[],notify_page_chang:[],now:2,num_pag:2,number:[0,2],obj:2,object:2,occur:2,off_rend:2,offscreenwindow:2,often:0,on_click:2,on_configure_annot:2,on_configure_da:2,on_configure_win:2,on_drag_drop:2,on_draw:2,on_keypress:2,on_label_ett_ev:[],on_label_ett_keypress:[],on_label_ev:2,on_navig:2,on_page_chang:2,on_pane_ev:2,on_scrol:2,on_spin_nav:[],on_window_state_ev:2,one:2,ones:2,onli:[0,2],open:[1,2],opensus:0,option:[0,2],order:2,ordereddict:2,orient:2,origin:0,other:[0,2],otherwis:2,our:2,outdat:2,output:0,outsid:2,over:0,overlai:2,overrid:2,own:[],p_central:2,p_da_cur:2,p_da_next:2,p_da_not:2,p_frame_annot:2,p_frame_cur:2,p_frame_next:2,p_frame_not:2,p_win:2,p_win_fullscreen:[],p_win_maxim:[],packag:[0,1],page:0,page_chang:2,page_nb:2,page_numb:2,page_preview:2,page_preview_nb:2,pagenumb:2,pages_cach:2,pages_numb:2,pair:[],pane:2,pane_handle_po:2,pane_resize_handl:2,parallel:2,paramet:2,parent:2,pars:2,particularli:2,pass:[0,2],path:2,path_to_config:2,paus:2,pdf:[0,2],pdf_content_pag:2,pdf_notes_pag:2,pdf_regular:2,perform:2,pick_fil:2,pixbuf:[0,2],pixel:2,pixmap:2,placeable_widget:2,placehold:2,plai:0,plain:2,plain_layout:2,plan:0,platform:0,play_media:2,player:2,point:2,pointer:[],pointer_hid:2,pointer_off:2,pointer_po:2,pointer_show:2,pop:2,pop_doc:2,pop_scribbl:2,poppler:[0,2],port:2,portabl:[0,2],posit:2,possibl:2,pre:[0,2],prefer:[0,2],prepar:2,prerequisit:0,pres_annot:2,pres_blank:2,pres_fullscreen:2,pres_highlight:2,pres_not:2,pres_paus:2,present:[0,2],press:[0,2],prev_button:2,prevent:2,preview:[0,2],previou:2,probabl:2,problem:2,process:2,program:2,projector:0,properti:2,proport:2,provid:2,pure:2,put:0,pygi:0,pygobject3:0,pygobject:0,python2:2,python3:[0,2],python:[1,2],queue:2,radio:2,radiomenuitem:2,rais:2,rang:2,ratio:2,reach:2,react:2,read:[0,2],reader:0,realli:[0,2],rearrang:2,receiv:2,recent:2,recent_docu:2,recent_menu:2,recentchoosermenu:2,recogn:2,rect:2,rectangl:2,recurs:2,recursive_unicode_to_str:2,red:2,redistribut:0,redraw:2,redraw_current_slid:2,redraw_pan:2,redraw_timeout:2,refer:2,region:2,regist:2,register_callback:[],regular:2,rel:[0,2],relat:2,relative_marg:[],relative_margin:2,releas:[0,2],reli:0,remain:2,remark:0,rememb:2,remix:2,remov:2,remove_on_exit:2,render:[0,2],render_cairo:2,render_point:2,replac:[0,2],replace_layout:2,replace_media_overlai:2,repo:0,repositori:2,reprens:2,repres:2,request:2,requir:[],reset:2,reset_tim:2,resiz:[0,2],resize_pan:2,resize_widget:2,resolv:2,resourc:2,resource_nam:2,resp:2,respect:[],restore_current_label:[],restore_current_label_ett:[],restore_label:2,result:2,retreiv:2,retriev:2,retructur:2,rgba:2,right:2,root:0,rst:[0,2],run:[0,2],runtim:2,safeti:2,said:2,same:[0,2],save:[0,2],save_and_quit:2,save_config:2,scale:2,schedul:2,scheme:2,schnouki:0,screen:0,screensav:2,scribbl:[],scribble_c_da:2,scribble_c_eb:2,scribble_color:2,scribble_draw:2,scribble_list:2,scribble_overlai:2,scribble_p_da:2,scribble_p_eb:2,scribble_p_fram:2,scribble_width:2,scribbler:2,scribbling_mod:2,scroll:[0,2],scrollable_treelist:2,scrolled_window:2,second:[0,2],see:[0,2],seem:2,select:[0,2],selectiondata:2,self:2,sens:2,sent:2,separ:[0,2],serv:2,set:[0,2],set_cursor:2,set_fil:2,set_last:2,set_screensav:2,set_widget_typ:2,setter:2,setup:[],setup_screen:2,setup_scribbl:[],setuptool:0,sever:2,share:[0,2],shell:0,ship:0,shortcut:[0,2],shortcut_kei:2,should:[0,2],show:2,show_annot:2,show_bigbutton:2,show_control:2,show_point:2,shown:2,side:2,signal:2,signal_connector:2,signal_nam:2,signal_resolv:2,similar:2,simpl:2,simpli:0,sinc:2,singl:2,size:[0,2],slide:0,slider:2,sluggish:2,softwar:0,solut:2,some:[0,2],someth:2,sort:2,sourc:2,specif:[0,2],specifi:2,speed:2,sphinx:[0,2],spin:[0,2],spin_cur:2,spinbutton:2,spinner:2,split:2,stackoverflow:2,start:[0,2],start_edit:2,start_editing_page_numb:2,start_en:2,start_tim:2,startup:2,state:2,statu:2,step:2,still:2,stop:2,stop_edit:2,stop_editing_est_tim:2,stop_editing_page_numb:2,stop_editing_slid:[],stop_editing_tim:[],store:2,str:2,string:[0,2],stroke:2,structur:2,stuff:2,style:[0,2],style_context:2,stylecontext:2,suffix:0,sum:2,supplementari:2,support:[0,2],suppos:2,sure:[0,2],surfac:2,surface_cach:2,surface_factori:2,surface_s:2,surface_typ:2,suspend:2,swap:0,swap_docu:2,swap_label_for_entri:2,swap_screen:2,switch_annot:2,switch_bigbutton:2,switch_blank:2,switch_fullscreen:2,switch_mod:2,switch_paus:2,switch_scribbl:2,syntax:0,system:0,take:0,talk:0,talk_tim:[],talktim:2,target:2,tell:2,temp_fil:2,templat:0,temporari:2,term:0,test:0,text:[0,2],than:2,thei:[0,2],them:[0,2],thi:[0,2],those:0,though:0,thread:2,threadsaf:2,through:[0,2],thu:2,tick:0,time:0,timecount:2,timelabelcolor:2,timeout_add:2,timer:2,timestamp:2,to_color:2,togeth:0,toggl:[0,2],toggle_point:2,toggle_scribbl:2,toggle_start:2,too:[0,2],tool:2,toolbar:2,toolbutton:2,toolkit:0,top:2,top_widget:2,touch:2,track:2,track_click:2,track_mot:2,track_point:2,track_scribbl:2,transfer:2,transform:2,translat:[1,2],tree:2,trigger:2,tupl:2,twhich:2,two:[0,2],type:[0,2],typelib:0,typic:[],ubuntu:0,undefin:2,under:[0,2],undo:2,unexpect:2,unicod:2,uniqu:2,unlik:0,unpaus:2,until:2,unus:2,updat:2,update_color:2,update_frame_posit:2,update_notes_layout:2,update_page_numb:2,update_plain_layout:2,update_tim:2,update_time_color:2,update_width:2,uppercas:2,uri:2,usag:1,use:[0,2],used:[0,2],useful:2,user:0,user_data:2,using:[0,2],usr:2,usual:[0,2],val:2,valid:[0,2],validate_layout:2,valu:2,valueerror:2,variou:0,vbox:2,veri:2,version:[0,2],vertic:2,via:2,video:0,view:2,visit:2,vlc:0,vlc_support_en:2,wai:2,want:[0,2],warn:2,well:[0,2],were:2,what:1,when:[],where:0,whether:2,which:[0,2],whole:[0,2],whose:2,widget_layout_to_tre:2,widget_nam:2,width:2,wiget:2,win32:2,window:[0,2],winow:2,within:2,without:[0,2],work:2,would:0,wrap:2,write:0,written:0,wrong:2,wtype:2,x64:0,x86:0,xalign:2,xml:2,yalign:2,yet:2,you:1,your:0,zypper:0},titles:["What is Pympress?","Welcome to pympress\u2019s documentation!","Pympress package"],titleterms:{"abstract":2,"function":[0,2],Using:0,annot:2,backend:2,binari:0,cach:2,can:2,clock:2,config:2,configur:2,content:1,contribut:0,current:2,cursor:2,depend:0,displai:2,document:[1,2],draw:2,edit:2,editable_label:2,elaps:2,emul:2,entri:2,extra:2,fanci:2,file:0,from:0,gui:2,hack:[],handl:2,have:0,indic:1,instal:0,label:2,laser:2,manag:2,modul:2,number:[],open:0,out:2,packag:2,page:2,page_numb:[],pip:0,plai:2,pointer:2,prerend:2,pympress:[0,1,2],python:0,screen:2,scribbl:2,slide:2,softwar:2,sourc:0,surfacecach:2,swap:2,tabl:1,talk:2,talk_tim:2,time:2,translat:0,ui_build:2,usag:0,user:2,util:2,variou:2,video:2,vlc:2,vlcvideo:2,welcom:1,what:0,when:2,where:2,widget:2,you:0}})
\ No newline at end of file
diff --git a/pympress/__init__.py b/pympress/__init__.py
index efdd7f00..d2c53886 100644
--- a/pympress/__init__.py
+++ b/pympress/__init__.py
@@ -21,7 +21,7 @@
 # DON'T IMPORT ANYTHING HERE (OR YOU WILL BREAK setup.py)
 #
 
-__version__ = '1.1.0b2'
+__version__ = '1.1.0'
 __copyright__= """2009, 2010 Thomas Jost <thomas.jost@gmail.com>
 2015-2017 Cimbali <me@cimba.li>
 2016 Christoph Rath <christof.rath@iaik.tugraz.at>