From d5a9fbc7dfdf59ee8a629807a3caf6720aab3d23 Mon Sep 17 00:00:00 2001
From: phintuka <phintuka>
Date: Thu, 13 Nov 2008 23:10:16 +0000
Subject: Moved xine-lib version check to fe_xine_init()

---
 xine_frontend.c      | 9 ++++++++-
 xine_frontend_main.c | 9 +--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/xine_frontend.c b/xine_frontend.c
index 874432d2..4a760297 100644
--- a/xine_frontend.c
+++ b/xine_frontend.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_frontend.c,v 1.81 2008-11-13 22:50:34 phintuka Exp $
+ * $Id: xine_frontend.c,v 1.82 2008-11-13 23:10:16 phintuka Exp $
  *
  */
 
@@ -521,6 +521,13 @@ static int fe_xine_init(frontend_t *this_gen, const char *audio_driver,
   if(!this)
     return 0;
 
+  /* check xine-lib version */
+  if(!xine_check_version(1, 1, 0)) {
+    LOGERR("xine-lib is too old, require at least xine library version 1.1.0\n");
+    return FE_ERROR;
+  }
+
+
   /*
    * init xine engine
    */
diff --git a/xine_frontend_main.c b/xine_frontend_main.c
index ab443b94..1987b021 100644
--- a/xine_frontend_main.c
+++ b/xine_frontend_main.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_frontend_main.c,v 1.56 2008-11-13 11:05:33 phintuka Exp $
+ * $Id: xine_frontend_main.c,v 1.57 2008-11-13 23:10:16 phintuka Exp $
  *
  */
 
@@ -485,13 +485,6 @@ int main(int argc, char *argv[])
 
   PRINTF("\n");
 
-  /* check xine-lib version */
-  if(!xine_check_version(1, 1, 0)) {
-    fprintf(stderr,"ERROR: xine-lib is too old, require at least "
-	    "xine library version 1.1.0\n");
-    return -1;
-  }
-
 #if 1
   /* backward compability */
   if(mrl && ( !strncmp(mrl, MRL_ID ":tcp:",  MRL_ID_LEN+5) ||
-- 
cgit v1.2.3