Updated Kaffeine to latest upstream version

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kaffeine@1182813 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 26 insertions, 22 deletions

diff --git a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h
index c275089..2b1d2e7 100644
--- a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h
+++ b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_auth.h
@@ -2,7 +2,7 @@
     en50221 encoder An implementation for libdvb
     an implementation for the en50221 transport layer
 
-    Copyright (C) 2004, 2005 Manu Abraham (manu@kromtek.com)
+    Copyright (C) 2004, 2005 Manu Abraham <abraham.manu@gmail.com>
     Copyright (C) 2005 Julian Scheel (julian at jusst dot de)
     Copyright (C) 2006 Andrew de Quincey (adq_dvb@lidskialf.net)
 
@@ -18,15 +18,14 @@
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
 
 #ifndef __EN50221_APPLICATION_auth_H__
 #define __EN50221_APPLICATION_auth_H__
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
 #include <stdlib.h>
@@ -46,14 +45,17 @@ extern "C"
  * @param auth_data_lenghth Number of bytes.
  * @return 0 on success, -1 on failure.
  */
-typedef int (*en50221_app_auth_request_callback)(void *arg, uint8_t slot_id, uint16_t session_number,
-                                                 uint16_t auth_protcol_id, uint8_t *auth_data,
-                                                 uint32_t auth_data_length);
+typedef int (*en50221_app_auth_request_callback) (void *arg,
+						  uint8_t slot_id,
+						  uint16_t session_number,
+						  uint16_t auth_protcol_id,
+						  uint8_t *auth_data,
+						  uint32_t auth_data_length);
 
 /**
  * Opaque type representing a auth resource.
  */
-typedef void *en50221_app_auth;
+struct en50221_app_auth;
 
 /**
  * Create an instance of the auth resource.
@@ -61,14 +63,14 @@ typedef void *en50221_app_auth;
  * @param funcs Send functions to use.
  * @return Instance, or NULL on failure.
  */
-extern en50221_app_auth en50221_app_auth_create(struct en50221_app_send_functions *funcs);
+extern struct en50221_app_auth *en50221_app_auth_create(struct en50221_app_send_functions *funcs);
 
 /**
  * Destroy an instance of the auth resource.
  *
  * @param auth Instance to destroy.
  */
-extern void en50221_app_auth_destroy(en50221_app_auth auth);
+extern void en50221_app_auth_destroy(struct en50221_app_auth *auth);
 
 /**
  * Register the callback for when we receive a request.
@@ -77,8 +79,9 @@ extern void en50221_app_auth_destroy(en50221_app_auth auth);
  * @param callback The callback. Set to NULL to remove the callback completely.
  * @param arg Private data passed as arg0 of the callback.
  */
-extern void en50221_app_auth_register_request_callback(en50221_app_auth auth,
-        en50221_app_auth_request_callback callback, void *arg);
+extern void en50221_app_auth_register_request_callback(struct en50221_app_auth *auth,
+						       en50221_app_auth_request_callback callback,
+						       void *arg);
 
 /**
  * Send an auth response to the CAM.
@@ -90,10 +93,11 @@ extern void en50221_app_auth_register_request_callback(en50221_app_auth auth,
  * @param auth_data_length Number of bytes.
  * @return 0 on success, -1 on failure.
  */
-extern int en50221_app_auth_send(en50221_app_auth auth,
-                                 uint16_t session_number,
-                                 uint16_t auth_protocol_id, uint8_t *auth_data,
-                                 uint32_t auth_data_length);
+extern int en50221_app_auth_send(struct en50221_app_auth *auth,
+				 uint16_t session_number,
+				 uint16_t auth_protocol_id,
+				 uint8_t *auth_data,
+				 uint32_t auth_data_length);
 
 /**
  * Pass data received for this resource into it for parsing.
@@ -106,14 +110,14 @@ extern int en50221_app_auth_send(en50221_app_auth auth,
  * @param data_length Length of data in bytes.
  * @return 0 on success, -1 on failure.
  */
-extern int en50221_app_auth_message(en50221_app_auth auth,
-                                    uint8_t slot_id,
-                                    uint16_t session_number,
-                                    uint32_t resource_id,
-                                    uint8_t *data, uint32_t data_length);
+extern int en50221_app_auth_message(struct en50221_app_auth *auth,
+				    uint8_t slot_id,
+				    uint16_t session_number,
+				    uint32_t resource_id,
+				    uint8_t *data,
+				    uint32_t data_length);
 
 #ifdef __cplusplus
 }
 #endif
-
 #endif