cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued...

CVS patchset: 5844
CVS date: 2003/12/05 15:54:56

2 files changed, 9 insertions, 9 deletions

diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c
index 1c6ca679d..89bf1dc1c 100644
--- a/src/libsputext/xine_decoder.c
+++ b/src/libsputext/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.69 2003/12/04 03:23:28 miguelfreitas Exp $
+ * $Id: xine_decoder.c,v 1.70 2003/12/05 15:55:00 f1rmb Exp $
  *
  */
 
@@ -564,7 +564,7 @@ static void update_osd_font(void *class_gen, xine_cfg_entry_t *entry)
 
   strcpy(class->font, entry->str_value);
   
-  printf("libsputext: spu_font = %s\n", class->font );
+  xprintf(class->xine, XINE_VERBOSITY_DEBUG, "libsputext: spu_font = %s\n", class->font );
 }
 
 static void update_subtitle_size(void *class_gen, xine_cfg_entry_t *entry)
@@ -618,7 +618,7 @@ static void update_src_encoding(void *class_gen, xine_cfg_entry_t *entry)
   sputext_class_t *class = (sputext_class_t *)class_gen;
 
   class->src_encoding = entry->str_value;
-  printf("libsputext: spu_src_encoding = %s\n", class->src_encoding );
+  xprintf(class->xine, XINE_VERBOSITY_DEBUG, "libsputext: spu_src_encoding = %s\n", class->src_encoding );
 }
 
 static void *init_spu_decoder_plugin (xine_t *xine, void *data) {
diff --git a/src/libsputext/xine_decoder_ogm.c b/src/libsputext/xine_decoder_ogm.c
index 21ad356b6..133abfcf8 100644
--- a/src/libsputext/xine_decoder_ogm.c
+++ b/src/libsputext/xine_decoder_ogm.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder_ogm.c,v 1.8 2003/11/26 19:43:36 f1rmb Exp $
+ * $Id: xine_decoder_ogm.c,v 1.9 2003/12/05 15:55:00 f1rmb Exp $
  *
  */
 
@@ -68,7 +68,7 @@ typedef struct spuogm_class_s {
 typedef struct spuogm_decoder_s {
   spu_decoder_t      spu_decoder;
 
-  spuogm_class_t   *class;
+  spuogm_class_t    *class;
   xine_stream_t     *stream;
 
   int                lines;
@@ -446,7 +446,7 @@ static void update_osd_font(void *this_gen, xine_cfg_entry_t *entry)
   if( this->renderer )
     this->renderer->set_font (this->osd, this->font, this->font_size);
   
-  printf("libspuogm: spu_font = %s\n", this->font );
+  xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, "libspuogm: spu_font = %s\n", this->font );
 }
 
 static void update_subtitle_size(void *this_gen, xine_cfg_entry_t *entry)
@@ -514,10 +514,10 @@ static char *spuogm_class_get_description (spu_decoder_class_t *this) {
 
 static void update_src_encoding(void *this_gen, xine_cfg_entry_t *entry)
 {
-  spuogm_class_t *this = (spuogm_class_t *)this_gen;
+  spuogm_class_t *class = (spuogm_class_t *)this_gen;
 
-  this->src_encoding = entry->str_value;
-  printf("libspuogm: spu_src_encoding = %s\n", this->src_encoding );
+  class->src_encoding = entry->str_value;
+  xprintf(class->xine, XINE_VERBOSITY_DEBUG, "libspuogm: spu_src_encoding = %s\n", class->src_encoding );
 }
 
 static void *init_spu_decoder_plugin (xine_t *xine, void *data) {