[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/sound_handler_gst.cpp b...
|
From: |
Tomas Groth |
|
Subject: |
[Gnash-commit] gnash ChangeLog backend/sound_handler_gst.cpp b... |
|
Date: |
Wed, 21 Feb 2007 19:18:45 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Tomas Groth <tgc> 07/02/21 19:18:45
Modified files:
. : ChangeLog
backend : sound_handler_gst.cpp sound_handler_sdl.cpp
macros : ffmpeg.m4
Log message:
* backend/sound_handler_{gst,sdl}.cpp: Removed newline from warnings,
and
added more user help.
* macros/ffmpeg.m4: Yet another go at bug #16663.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2425&r2=1.2426
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.31&r2=1.32
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2425
retrieving revision 1.2426
diff -u -b -r1.2425 -r1.2426
--- ChangeLog 21 Feb 2007 17:41:11 -0000 1.2425
+++ ChangeLog 21 Feb 2007 19:18:45 -0000 1.2426
@@ -1,5 +1,11 @@
2007-02-21 Tomas Groth Christensen <address@hidden>
+ * backend/sound_handler_{gst,sdl}.cpp: Removed newline from warnings,
and
+ added more user help.
+ * macros/ffmpeg.m4: Yet another go at bug #16663.
+
+2007-02-21 Tomas Groth Christensen <address@hidden>
+
* configure.ac, macros/ffmpeg.m4: Another go at bug #16663.
* backend/sound_handler_gst.cpp: Added warnings when using fluendos
mp3 plugin for gstreamer, since it doesn't support soundstreams.
Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- backend/sound_handler_gst.cpp 21 Feb 2007 17:41:11 -0000 1.31
+++ backend/sound_handler_gst.cpp 21 Feb 2007 19:18:45 -0000 1.32
@@ -1,4 +1,4 @@
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
// Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
// which has been donated to the Public Domain.
-/* $Id: sound_handler_gst.cpp,v 1.31 2007/02/21 17:41:11 tgc Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.32 2007/02/21 19:18:45 tgc Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -74,7 +74,7 @@
sound_data *sounddata = new sound_data;
if (!sounddata) {
- gnash::log_error("could not allocate memory for sounddata !\n");
+ gnash::log_error("could not allocate memory for sounddata !");
return -1;
}
@@ -99,7 +99,7 @@
signed: { true, false }*/
sounddata->data = new guint8[data_bytes];
if (!sounddata->data) {
- gnash::log_error("could not allocate space for data in
soundhandler\n");
+ gnash::log_error("could not allocate space for data in
soundhandler.");
return -1;
}
memcpy(sounddata->data, data, data_bytes);
@@ -116,7 +116,7 @@
signed: { true, false }*/
sounddata->data = new guint8[data_bytes];
if (!sounddata->data) {
- gnash::log_error("could not allocate space for data in
soundhandler\n");
+ gnash::log_error("could not allocate space for data in
soundhandler.");
return -1;
}
memcpy(sounddata->data, data, data_bytes);
@@ -126,7 +126,7 @@
//case FORMAT_VORBIS:
sounddata->data = new guint8[data_bytes];
if (!sounddata->data) {
- gnash::log_error("could not allocate space for data in
soundhandler\n");
+ gnash::log_error("could not allocate space for data in
soundhandler.");
return -1;
}
memcpy(sounddata->data, data, data_bytes);
@@ -134,7 +134,7 @@
break;
default:
// Unhandled format.
- gnash::log_error("unknown format sound requested; this demo
does not handle it\n");
+ gnash::log_error("unknown format sound requested; this demo
does not handle it.");
return -1; // Unhandled format, set to NULL.
}
@@ -258,7 +258,7 @@
// Make a "gst_elements" for this sound which is latter placed on the
vector of instances of this sound being played
gst_elements* gst_element = new gst_elements;
if (gst_element == NULL) {
- gnash::log_error ("could not allocate memory for gst_element
!\n");
+ gnash::log_error ("could not allocate memory for gst_element
!");
return;
}
// Copy data-info to the "gst_elements"
@@ -283,10 +283,10 @@
// Check if the creation of the gstreamer pipeline, adder and audiosink
was a succes
if (!gst_element->pipeline) {
- gnash::log_error("The gstreamer pipeline element could not be
created\n");
+ gnash::log_error("The gstreamer pipeline element could not be
created!");
}
if (!gst_element->audiosink) {
- gnash::log_error("The gstreamer audiosink element could not be
created\n");
+ gnash::log_error("The gstreamer audiosink element could not be
created!");
}
// link adder and output to bin
@@ -312,7 +312,7 @@
|| !gst_element->audioconvert
|| !gst_element->audioresample) {
- gnash::log_error("Gstreamer element for audio handling could
not be created\n");
+ gnash::log_error("Gstreamer element for audio handling could
not be created!");
return;
}
@@ -328,7 +328,7 @@
}
// Check if the element was correctly created
if (!gst_element->decoder) {
- gnash::log_error("A gstreamer mp3-decoder element could
not be created\n");
+ gnash::log_error("A gstreamer mp3-decoder element could
not be created! You probably need to install a mp3-decoder plugin like
gstreamer0.10-mad or gstreamer0.10-ffmpeg.");
return;
}
gst_bin_add (GST_BIN (gst_element->bin), gst_element->decoder);
Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- backend/sound_handler_sdl.cpp 19 Feb 2007 21:45:41 -0000 1.47
+++ backend/sound_handler_sdl.cpp 21 Feb 2007 19:18:45 -0000 1.48
@@ -18,7 +18,7 @@
// Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
// which has been donated to the Public Domain.
-// $Id: sound_handler_sdl.cpp,v 1.47 2007/02/19 21:45:41 tgc Exp $
+// $Id: sound_handler_sdl.cpp,v 1.48 2007/02/21 19:18:45 tgc Exp $
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -74,7 +74,7 @@
sound_data *sounddata = new sound_data;
if (!sounddata) {
- gnash::log_error("could not allocate memory for sounddata !\n");
+ gnash::log_error("could not allocate memory for sounddata !");
return -1;
}
@@ -97,7 +97,7 @@
if (data_bytes > 0) {
convert_raw_data(&adjusted_data, &adjusted_size, data,
sample_count, 1, sample_rate, stereo);
if (!adjusted_data) {
- gnash::log_error("Some kind of error with raw
sound data\n");
+ gnash::log_error("Some kind of error with raw
sound data.");
return -1;
}
sounddata->data_size = adjusted_size;
@@ -110,7 +110,7 @@
if (data_bytes > 0) {
convert_raw_data(&adjusted_data, &adjusted_size, data,
sample_count, 2, sample_rate, stereo);
if (!adjusted_data) {
- gnash::log_error("Some kind of error with adpcm
sound data\n");
+ gnash::log_error("Some kind of error with adpcm
sound data.");
return -1;
}
sounddata->data_size = adjusted_size;
@@ -122,13 +122,13 @@
//case FORMAT_VORBIS:
#ifndef USE_FFMPEG
#ifndef USE_MAD
- gnash::log_warning("gnash has not been compiled to handle mp3
audio\n");
+ gnash::log_warning("gnash has not been compiled to handle mp3
audio.");
return -1;
#endif
#endif
sounddata->data = new Uint8[data_bytes];
if (!sounddata->data) {
- gnash::log_error("could not allocate space for data in
soundhandler\n");
+ gnash::log_error("could not allocate space for data in
soundhandler.");
return -1;
}
memcpy(sounddata->data, data, data_bytes);
@@ -136,7 +136,7 @@
break;
default:
// Unhandled format.
- gnash::log_error("unknown format sound requested; gnash does
not handle it\n");
+ gnash::log_error("unknown format sound requested; gnash does
not handle it.");
return -1; // Unhandled format, set to NULL.
}
@@ -168,7 +168,7 @@
convert_raw_data(&adjusted_data, &adjusted_size, data,
sample_count, 2, sounddata->sample_rate, sounddata->stereo);
if (!adjusted_data || adjusted_size < 1) {
- gnash::log_error("Some kind of error with re-formating
sound data\n");
+ gnash::log_error("Some kind of error with resampling
sound data.");
return -1;
}
adjusted_data = static_cast<int16_t*>(data);
@@ -213,7 +213,7 @@
}
} else {
- gnash::log_error("Behavior for this audio codec is unknown.
Please send this SWF to the developers\n");
+ gnash::log_error("Behavior for this audio codec is unknown.
Please send this SWF to the developers!");
}
return start_size;
@@ -274,7 +274,7 @@
sound->parser = av_parser_init(CODEC_ID_MP3);
if (!sound->codec) {
- gnash::log_error("Your FFMPEG can't decode MP3?!\n");
+ gnash::log_error("Your FFMPEG can't decode MP3?!");
return;
}
@@ -302,7 +302,7 @@
if (!soundOpened) {
if (SDL_OpenAudio(&audioSpec, NULL) < 0 ) {
- gnash::log_error("Unable to START SOUND: %s\n",
SDL_GetError());
+ gnash::log_error("Unable to START SOUND: %s.",
SDL_GetError());
return;
}
soundOpened = true;
@@ -492,7 +492,7 @@
if (!soundOpened) {
if (SDL_OpenAudio(&audioSpec, NULL) < 0 ) {
- gnash::log_error("Unable to START SOUND: %s\n",
SDL_GetError());
+ gnash::log_error("Unable to START SOUND: %s.",
SDL_GetError());
return;
}
soundOpened = true;
@@ -838,7 +838,7 @@
#endif
if (bytes_decoded < 0 || tmp <
0 || outsize < 0) {
- gnash::log_error("Error
while decoding MP3-stream. Upgrading ffmpeg/libavcodec might fix this
issue.\n");
+ gnash::log_error("Error
while decoding MP3-stream. Upgrading ffmpeg/libavcodec might fix this issue.");
// Setting data
position to data size will get the sound removed
// from the active
sound list later on.
sound->position =
sound->data_size;
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- macros/ffmpeg.m4 21 Feb 2007 17:41:11 -0000 1.31
+++ macros/ffmpeg.m4 21 Feb 2007 19:18:45 -0000 1.32
@@ -14,7 +14,7 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: ffmpeg.m4,v 1.31 2007/02/21 17:41:11 tgc Exp $
+dnl $Id: ffmpeg.m4,v 1.32 2007/02/21 19:18:45 tgc Exp $
AC_DEFUN([GNASH_PATH_FFMPEG],
[
@@ -67,14 +67,12 @@
dnl fi
dnl fi
- ffmpeg_num_version=`$EGREP "define LIBAVCODEC_VERSION " ${topdir}/avcodec.h
| sed -e "s%[^0-9]%%g"`
- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${topdir}/avcodec.h |
sed -e "s%[^0-9.]%%g"`
+ ffmpeg_num_version=`$EGREP "define LIBAVCODEC_VERSION " ${topdir}/avcodec.h
| sed -e "s%[[^0-9]]%%g"`
+ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${topdir}/avcodec.h |
sed -e "s%[[^0-9.]]%%g"`
if test x"${ffmpeg_version}" = x ; then
- ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${topdir}/avcodec.h |
sed -e "s%[^0-9.]%%g"`
- ffmpeg_num_version=`$EGREP "define LIBAVCODEC_BUILD " ${topdir}/avcodec.h
| sed -e "s%[^0-9]%%g"`
- AC_MSG_RESULT(${ffmpeg_version})
- AC_MSG_RESULT(${ffmpeg_num_version})
+ ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${topdir}/avcodec.h |
sed -e "s%[[^0-9.]]%%g"`
+ ffmpeg_num_version=`$EGREP "define LIBAVCODEC_BUILD " ${topdir}/avcodec.h
| sed -e "s%[[^0-9]]%%g"`
fi
dnl AC_EGREP_HEADER(avcodec_decode_audio2, ${topdir}/avcodec.h,
[avfound=yes], [avfound=no])
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog backend/sound_handler_gst.cpp b...,
Tomas Groth <=