[vlc-commits] dbus: Fix handling of input events and remove memleaks

Mirsal Ennaime git at videolan.org
Sun Mar 10 04:04:40 CET 2013


vlc | branch: master | Mirsal Ennaime <mirsal at videolan.org> | Sun Mar 10 03:54:55 2013 +0100| [01b2d9f038211e91fd2348858d58931f0a48faa1] | committer: Mirsal Ennaime

dbus: Fix handling of input events and remove memleaks

Correctly handle the INPUT_EVENT_ITEM_META and INPUT_EVENT_ITEM_META
instead of skipping the whole event processing code without even freeing
the callback_info_t data structure.

Closes: #8285

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=01b2d9f038211e91fd2348858d58931f0a48faa1
---

 modules/control/dbus/dbus.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
index 7634172..1b760c9 100644
--- a/modules/control/dbus/dbus.c
+++ b/modules/control/dbus/dbus.c
@@ -932,10 +932,10 @@ static int InputCallback( vlc_object_t *p_this, const char *psz_var,
             break;
         case INPUT_EVENT_ITEM_META:
             p_info->signal = SIGNAL_INPUT_METADATA;
-            return VLC_SUCCESS;
+            break;
         case INPUT_EVENT_RATE:
             p_info->signal = SIGNAL_RATE;
-            return VLC_SUCCESS;
+            break;
         case INPUT_EVENT_POSITION:
         {
             mtime_t i_now = mdate(), i_pos, i_projected_pos, i_interval;



More information about the vlc-commits mailing list