[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] =?utf-8?q?HG=3A_xine-lib-1=2E2=3A_demux=5Fmpgaudio=3A_?= =?utf-8?q?simplify_class?=
From:       Petri_Hintukainen via Xine-cvslog <xine-cvslog () lists ! sourceforge ! net
Date:       2017-09-29 13:55:59
Message-ID: f79b9e077273bc6e89d1.1506691949 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Petri Hintukainen <phintuka@users.sourceforge.net>
# Date 1506691949 -10800
# Node ID f79b9e077273bc6e89d173938b17fa3b00904dab
# Branch  default
# Parent  7937f905cb3eefbc48bf6e1980af282aab2b7d28
demux_mpgaudio: simplify class

diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -158,17 +158,6 @@
 
 } demux_mpgaudio_t ;
 
-/* demuxer class struct */
-typedef struct {
-
-  demux_class_t     demux_class;
-
-  /* class-wide, global variables here */
-
-  xine_t           *xine;
-
-} demux_mpgaudio_class_t;
-
 /*
  * Parse a mp3 frame
  * return 1 on success
@@ -1222,16 +1211,15 @@
  */
 void *demux_mpgaudio_init_class (xine_t *xine, void *data) {
 
-  demux_mpgaudio_class_t     *this;
+  demux_class_t     *this;
 
-  this         = calloc(1, sizeof(demux_mpgaudio_class_t));
-  this->xine   = xine;
+  this         = calloc(1, sizeof(demux_class_t));
 
-  this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.description     = N_("MPEG audio demux plugin");
-  this->demux_class.identifier      = "MPEGAUDIO";
-  if( _x_decoder_available(this->xine, BUF_AUDIO_MPEG) ) {
-    this->demux_class.mimetypes =
+  this->open_plugin     = open_plugin;
+  this->description     = N_("MPEG audio demux plugin");
+  this->identifier      = "MPEGAUDIO";
+  if( _x_decoder_available(xine, BUF_AUDIO_MPEG) ) {
+    this->mimetypes =
       "audio/mpeg2: mp2: MPEG audio;"
       "audio/x-mpeg2: mp2: MPEG audio;"
       "audio/mpeg3: mp3: MPEG audio;"
@@ -1242,12 +1230,12 @@
       "audio/mpegurl: mp3: MPEG audio;"
       "audio/mp3: mp3: MPEG audio;"
       "audio/x-mp3: mp3: MPEG audio;";
-    this->demux_class.extensions    = "mp3 mp2 mpa mpega";
+    this->extensions    = "mp3 mp2 mpa mpega";
   } else {
-    this->demux_class.mimetypes     = NULL;
-    this->demux_class.extensions    = NULL;
+    this->mimetypes     = NULL;
+    this->extensions    = NULL;
   }
-  this->demux_class.dispose         = default_demux_class_dispose;
+  this->dispose         = default_demux_class_dispose;
 
   return this;
 }

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
[prev in list] [next in list] [prev in thread] [next in thread]