[vlc-commits] meta_fetcher: rename as scope and set values

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed May 21 19:22:41 2014 +0200| [44c6d7926c14e20d98a75569fa1450dd4634f943] | committer: Francois Cartegnie

meta_fetcher: rename as scope and set values

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

 include/vlc_input_item.h          |    8 ++++----
 include/vlc_meta_fetcher.h        |    6 +++---
 modules/gui/qt4/input_manager.cpp |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h
index d869312..977b1a7 100644
--- a/include/vlc_input_item.h
+++ b/include/vlc_input_item.h
@@ -293,10 +293,10 @@ VLC_API void input_item_Release(input_item_t *);
 
 typedef enum input_item_meta_request_option_t
 {
-    META_REQUEST_OPTION_NONE = 0,
-    META_REQUEST_OPTION_LOCAL = 1 << 0,
-    META_REQUEST_OPTION_NETWORK = 1 << 1,
-    META_REQUEST_OPTION_ANY = 1 << 2
+    META_REQUEST_OPTION_NONE          = 0x00,
+    META_REQUEST_OPTION_SCOPE_LOCAL   = 0x01,
+    META_REQUEST_OPTION_SCOPE_NETWORK = 0x02,
+    META_REQUEST_OPTION_SCOPE_ANY     = 0x03
 } input_item_meta_request_option_t;
 
 VLC_API int libvlc_MetaRequest(libvlc_int_t *, input_item_t *,
diff --git a/include/vlc_meta_fetcher.h b/include/vlc_meta_fetcher.h
index f1ce229..e806145 100644
--- a/include/vlc_meta_fetcher.h
+++ b/include/vlc_meta_fetcher.h
@@ -23,9 +23,9 @@
 
 typedef enum meta_fetcher_scope_t
 {
-    FETCHER_SCOPE_LOCAL,
-    FETCHER_SCOPE_NETWORK,
-    FETCHER_SCOPE_ANY
+    FETCHER_SCOPE_LOCAL   = 0x01,
+    FETCHER_SCOPE_NETWORK = 0x02,
+    FETCHER_SCOPE_ANY     = 0x03
 } meta_fetcher_scope_t;
 
 typedef struct meta_fetcher_t
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index d6f0600..c07f712 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -684,7 +684,7 @@ void InputManager::requestArtUpdate( input_item_t *p_item, bool b_forced )
                 return;
         }
         libvlc_ArtRequest( p_intf->p_libvlc, p_item,
-                           (b_forced) ? META_REQUEST_OPTION_ANY
+                           (b_forced) ? META_REQUEST_OPTION_SCOPE_ANY
                                       : META_REQUEST_OPTION_NONE );
         /* No input will signal the cover art to update,
              * let's do it ourself */