Removes trailing spaces. Removes tabs.

[vlc] / activex / vlccontrol2.h

diff --git a/activex/vlccontrol2.h b/activex/vlccontrol2.h
old mode 100755 (executable)
new mode 100644 (file)
index 2d0fd75..23c2853
--- a/activex/vlccontrol2.h
+++ b/activex/vlccontrol2.h
@@ -4,6 +4,7 @@
  * Copyright (C) 2006 the VideoLAN team
  *
  * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
+ *          Jean-Paul Saman <jpsaman _at_ m2x _dot_ nl>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,8 +66,12 @@ public:
     STDMETHODIMP put_mute(VARIANT_BOOL);
     STDMETHODIMP get_volume(long*);
     STDMETHODIMP put_volume(long);
+    STDMETHODIMP get_track(long*);
+    STDMETHODIMP put_track(long);
+    STDMETHODIMP get_channel(long*);
+    STDMETHODIMP put_channel(long);
     STDMETHODIMP toggleMute();
- 
+
 protected:
     HRESULT loadTypeInfo();
 
@@ -75,7 +80,7 @@ private:
     ITypeInfo*      _p_typeinfo;
 
 };
- 
+
 class VLCInput : public IVLCInput
 {
 public:
@@ -130,7 +135,7 @@ private:
     ITypeInfo*      _p_typeinfo;
 
 };
- 
+
 class VLCMessage: public IVLCMessage
 {
 public:
@@ -184,7 +189,7 @@ public:
     STDMETHODIMP get_name(BSTR *);
     STDMETHODIMP get_header(BSTR *);
     STDMETHODIMP get_message(BSTR *);
-    
+
 protected:
     HRESULT loadTypeInfo();
 
@@ -195,7 +200,7 @@ private:
 
     struct libvlc_log_message_t _msg;
 };
- 
+
 class VLCLog;
 
 class VLCMessageIterator : public IVLCMessageIterator
@@ -243,7 +248,7 @@ public:
     // IVLCMessageIterator methods
     STDMETHODIMP get_hasNext(VARIANT_BOOL*);
     STDMETHODIMP next(IVLCMessage**);
-    
+ 
 protected:
     HRESULT loadTypeInfo();
 
@@ -255,7 +260,7 @@ private:
     VLCLog*                 _p_vlclog;
     libvlc_log_iterator_t*  _p_iter;
 };
- 
+
 class VLCMessages : public IVLCMessages
 {
 public:
@@ -297,7 +302,7 @@ public:
     STDMETHODIMP clear();
     STDMETHODIMP get_count(long*);
     STDMETHODIMP iterator(IVLCMessageIterator**);
-    
+
 protected:
     HRESULT loadTypeInfo();
 
@@ -355,7 +360,7 @@ public:
     STDMETHODIMP get_messages(IVLCMessages**);
     STDMETHODIMP get_verbosity(long *);
     STDMETHODIMP put_verbosity(long);
-    
+
 protected:
     HRESULT loadTypeInfo();
 
@@ -367,7 +372,7 @@ private:
 
     VLCMessages*    _p_vlcmessages;
 };
- 
+
 class VLCPlaylistItems : public IVLCPlaylistItems
 {
 public:
@@ -405,7 +410,7 @@ public:
     STDMETHODIMP get_count(long*);
     STDMETHODIMP clear();
     STDMETHODIMP remove(long);
- 
+
 protected:
     HRESULT loadTypeInfo();
 
@@ -414,7 +419,7 @@ private:
     ITypeInfo*  _p_typeinfo;
 
 };
- 
+
 class VLCPlaylist : public IVLCPlaylist
 {
 public:
@@ -466,7 +471,7 @@ public:
     STDMETHODIMP clear();
     STDMETHODIMP removeItem(long);
     STDMETHODIMP get_items(IVLCPlaylistItems**);
- 
+
 protected:
     HRESULT loadTypeInfo();
 
@@ -476,7 +481,7 @@ private:
 
     VLCPlaylistItems*    _p_vlcplaylistitems;
 };
- 
+
 class VLCVideo : public IVLCVideo
 {
 public:
@@ -517,8 +522,15 @@ public:
     STDMETHODIMP get_height(long*);
     STDMETHODIMP get_aspectRatio(BSTR*);
     STDMETHODIMP put_aspectRatio(BSTR);
+    STDMETHODIMP get_subtitle(long*);
+    STDMETHODIMP put_subtitle(long);
+    STDMETHODIMP get_crop(BSTR*);
+    STDMETHODIMP put_crop(BSTR);
+    STDMETHODIMP get_teletext(long*);
+    STDMETHODIMP put_teletext(long);
+    STDMETHODIMP takeSnapshot(LPPICTUREDISP*);
     STDMETHODIMP toggleFullscreen();
- 
+
 protected:
     HRESULT loadTypeInfo();
 
@@ -527,10 +539,9 @@ private:
     ITypeInfo*      _p_typeinfo;
 
 };
- 
+
 class VLCControl2 : public IVLCControl2
 {
-    
 public:
 
     VLCControl2(VLCPlugin *p_instance);
@@ -577,6 +588,8 @@ public:
     STDMETHODIMP put_Visible(VARIANT_BOOL visible);
     STDMETHODIMP get_Volume(long *volume);
     STDMETHODIMP put_Volume(long volume);
+    STDMETHODIMP get_BackColor(OLE_COLOR *backcolor);
+    STDMETHODIMP put_BackColor(OLE_COLOR backcolor);
 
     STDMETHODIMP get_audio(IVLCAudio**);
     STDMETHODIMP get_input(IVLCInput**);
@@ -597,6 +610,5 @@ private:
     VLCPlaylist*    _p_vlcplaylist;
     VLCVideo*       _p_vlcvideo;
 };
- 
-#endif
 
+#endif