diff options
Diffstat (limited to 'src/post/visualizations/oscope.c')
| -rw-r--r-- | src/post/visualizations/oscope.c | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c index 483fc39ab..1d498980a 100644 --- a/src/post/visualizations/oscope.c +++ b/src/post/visualizations/oscope.c @@ -15,20 +15,17 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * Basic Oscilloscope Visualization Post Plugin For xine * by Mike Melanson (melanson@pcisys.net) - * - * $Id: oscope.c,v 1.21 2006/12/02 22:35:18 miguelfreitas Exp $ - * */ #include <stdio.h> -#include "xine_internal.h" -#include "xineutils.h" -#include "post.h" +#include <xine/xine_internal.h> +#include <xine/xineutils.h> +#include <xine/post.h> #include "visualizations.h" #define FPS 20 @@ -164,7 +161,7 @@ static int oscope_rewire_video(xine_post_out_t *output_gen, void *data) if (!data) return 0; old_port->close(old_port, XINE_ANON_STREAM); - new_port->open(new_port, XINE_ANON_STREAM); + (new_port->open) (new_port, XINE_ANON_STREAM); /* reconnect ourselves */ this->vo_port = new_port; return 1; @@ -194,10 +191,10 @@ static int oscope_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream, this->sample_counter = 0; init_yuv_planes(&this->yuv, OSCOPE_WIDTH, OSCOPE_HEIGHT); - this->vo_port->open(this->vo_port, XINE_ANON_STREAM); + (this->vo_port->open) (this->vo_port, XINE_ANON_STREAM); this->metronom->set_master(this->metronom, stream->metronom); - return port->original_port->open(port->original_port, stream, bits, rate, mode ); + return (port->original_port->open) (port->original_port, stream, bits, rate, mode ); } static void oscope_port_close(xine_audio_port_t *port_gen, xine_stream_t *stream ) { @@ -358,21 +355,6 @@ static post_plugin_t *oscope_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static char *oscope_get_identifier(post_class_t *class_gen) -{ - return "Oscilloscope"; -} - -static char *oscope_get_description(post_class_t *class_gen) -{ - return "Oscilloscope"; -} - -static void oscope_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *oscope_init_plugin(xine_t *xine, void *data) { @@ -382,9 +364,9 @@ void *oscope_init_plugin(xine_t *xine, void *data) return NULL; class->post_class.open_plugin = oscope_open_plugin; - class->post_class.get_identifier = oscope_get_identifier; - class->post_class.get_description = oscope_get_description; - class->post_class.dispose = oscope_class_dispose; + class->post_class.identifier = "Oscilloscope"; + class->post_class.description = N_("Oscilloscope"); + class->post_class.dispose = default_post_class_dispose; class->xine = xine; |