Checks ncursesw/curses.h presence

diff --git a/configure.ac b/configure.ac
index 911eaf02a8e252ddd827125772f4b34fef417219..1f852d036fb270caf733eb3d6fcd2012fa21b84a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5312,8 +5312,10 @@ dnl
 AC_ARG_ENABLE(ncurses,
   [  --enable-ncurses        ncurses interface support (default disabled)],
   [if test "${enable_ncurses}" = "yes"; then
-     VLC_ADD_PLUGINS([ncurses])
-     VLC_ADD_LDFLAGS([ncurses],[-lncursesw])
+     AC_CHECK_HEADERS(ncursesw/curses.h,[
+       VLC_ADD_PLUGINS([ncurses])
+       VLC_ADD_LDFLAGS([ncurses],[-lncursesw])
+     ])
    fi])
 
 dnl

diff --git a/extras/mpris.py b/extras/mpris.py
index f5948dfca2b5649d6567e3408865b0934f32df12..b8710521dd752f54eb074721225dc0f63ede5e57 100755 (executable)
--- a/extras/mpris.py
+++ b/extras/mpris.py
@@ -222,9 +222,12 @@ def tray_button(widget):
         window.move(position[0], position[1])
         window.show()
 
-#ui setup
-xml = gtk.glade.XML('mpris.glade')
+#loads glade file from the directory where the script is,
+#so we can use /path/to/mpris.py to execute it.
+import sys
+xml = gtk.glade.XML(os.path.dirname(sys.argv[0]) + '/mpris.glade')
 
+#ui setup
 bt_close    = xml.get_widget('close')
 bt_quit     = xml.get_widget('quit')
 bt_file     = xml.get_widget('ChooseFile')

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 1c9d8f40fd83a70fbe83684362d13b9f7bcfc024..4dcbead074babb85368e4bae7bcf76e6aebe5368 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -489,7 +489,7 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
                 return;
             }
         }
-
+        printf( "pointer playlist XX: %p\n", p_current->lock.p_this );
         p_current = p_obj->pp_waiting[0];
         REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
         vlc_mutex_unlock( &p_obj->object_lock );