[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso src/audiofileio/encode/VorbisAudioWrit...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso src/audiofileio/encode/VorbisAudioWrit... |
|
Date: |
Tue, 11 Dec 2007 17:30:11 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/12/11 17:30:11
Modified files:
src/audiofileio/encode: VorbisAudioWriter.cpp
src/commands : AddRemove.cpp AddRemove.h PCommand.cpp
PCommand.h
src/common : Tsar.cpp Tsar.h
src/core : FadeCurve.h Song.h
. : TODO
Log message:
* fixed compile warnings when compiling with gcc >= 4.2
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/encode/VorbisAudioWriter.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/AddRemove.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/AddRemove.h?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/PCommand.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/PCommand.h?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/common/Tsar.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/common/Tsar.h?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FadeCurve.h?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.h?cvsroot=traverso&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/traverso/TODO?cvsroot=traverso&r1=1.16&r2=1.17
Patches:
Index: src/audiofileio/encode/VorbisAudioWriter.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/audiofileio/encode/VorbisAudioWriter.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/audiofileio/encode/VorbisAudioWriter.cpp 22 Oct 2007 16:49:43
-0000 1.6
+++ src/audiofileio/encode/VorbisAudioWriter.cpp 11 Dec 2007 17:30:10
-0000 1.7
@@ -180,7 +180,7 @@
vorbis_comment_init(d->vorbisComment);
// add the encoder tag (so everybody knows we did it! ;)
- vorbis_comment_add_tag(d->vorbisComment, "ENCODER", "Traverso");
+ vorbis_comment_add_tag(d->vorbisComment, (char*)"ENCODER",
(char*)"Traverso");
// set up the analysis state and auxiliary encoding storage
d->vorbisDspState = new vorbis_dsp_state;
Index: src/commands/AddRemove.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/AddRemove.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/commands/AddRemove.cpp 21 Jun 2007 14:31:10 -0000 1.3
+++ src/commands/AddRemove.cpp 11 Dec 2007 17:30:10 -0000 1.4
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: AddRemove.cpp,v 1.3 2007/06/21 14:31:10 r_sijrier Exp $
+$Id: AddRemove.cpp,v 1.4 2007/12/11 17:30:10 r_sijrier Exp $
*/
#include "AddRemove.h"
@@ -158,10 +158,10 @@
void* arg,
bool historable,
Song* song,
- char * doActionSlot,
- char * doSignal,
- char * undoActionSlot,
- char * undoSignal,
+ const char * doActionSlot,
+ const char * doSignal,
+ const char * undoActionSlot,
+ const char * undoSignal,
const QString& des)
: Command(parent, des),
m_parentItem(parent),
Index: src/commands/AddRemove.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/AddRemove.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/commands/AddRemove.h 6 Mar 2007 15:13:33 -0000 1.1
+++ src/commands/AddRemove.h 11 Dec 2007 17:30:10 -0000 1.2
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- $Id: AddRemove.h,v 1.1 2007/03/06 15:13:33 r_sijrier Exp $
+ $Id: AddRemove.h,v 1.2 2007/12/11 17:30:10 r_sijrier Exp $
*/
#ifndef ADD_ITEM_COMMAND_H
@@ -37,10 +37,10 @@
void* arg,
bool historable,
Song* song,
- char* doActionSlot,
- char* doSignal,
- char* undoActionSlot,
- char* undoSignal,
+ const char* doActionSlot,
+ const char* doSignal,
+ const char* undoActionSlot,
+ const char* undoSignal,
const QString& des);
~AddRemove();
@@ -58,10 +58,10 @@
TsarEvent m_undoActionEvent;
Song* m_song;
- char* m_doActionSlot;
- char* m_undoActionSlot;
- char* m_doSignal;
- char* m_undoSignal;
+ const char* m_doActionSlot;
+ const char* m_undoActionSlot;
+ const char* m_doSignal;
+ const char* m_undoSignal;
bool m_instantanious;
};
Index: src/commands/PCommand.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/PCommand.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/commands/PCommand.cpp 1 Dec 2007 16:19:44 -0000 1.6
+++ src/commands/PCommand.cpp 11 Dec 2007 17:30:10 -0000 1.7
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: PCommand.cpp,v 1.6 2007/12/01 16:19:44 r_sijrier Exp $
+$Id: PCommand.cpp,v 1.7 2007/12/11 17:30:10 r_sijrier Exp $
*/
#include "PCommand.h"
@@ -29,14 +29,14 @@
#include "Debugger.h"
-PCommand::PCommand(ContextItem* item, char* slot, const QString& des)
+PCommand::PCommand(ContextItem* item, const char* slot, const QString& des)
: Command(item, des)
, m_contextitem(item)
, m_slot(slot)
{
}
-PCommand::PCommand(ContextItem * item, char * slot, QVariant doValue, QVariant
undoValue, const QString & des)
+PCommand::PCommand(ContextItem * item, const char * slot, QVariant doValue,
QVariant undoValue, const QString & des)
: Command(item, des)
, m_contextitem(item)
, m_slot(slot)
Index: src/commands/PCommand.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/PCommand.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/commands/PCommand.h 30 Nov 2007 19:31:49 -0000 1.3
+++ src/commands/PCommand.h 11 Dec 2007 17:30:10 -0000 1.4
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- $Id: PCommand.h,v 1.3 2007/11/30 19:31:49 r_sijrier Exp $
+ $Id: PCommand.h,v 1.4 2007/12/11 17:30:10 r_sijrier Exp $
*/
#ifndef PCOMMAND_H
@@ -30,8 +30,8 @@
class PCommand : public Command
{
public :
- PCommand(ContextItem* item, char* slot, const QString& des);
- PCommand(ContextItem* item, char* slot, QVariant doValue, QVariant
undoValue, const QString& des);
+ PCommand(ContextItem* item, const char* slot, const QString& des);
+ PCommand(ContextItem* item, const char* slot, QVariant doValue,
QVariant undoValue, const QString& des);
~PCommand();
int prepare_actions();
@@ -42,7 +42,7 @@
private :
ContextItem* m_contextitem;
- char* m_slot;
+ const char* m_slot;
QVariant m_doValue;
QVariant m_undoValue;
Index: src/common/Tsar.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/common/Tsar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/common/Tsar.cpp 5 Nov 2007 15:49:29 -0000 1.2
+++ src/common/Tsar.cpp 11 Dec 2007 17:30:11 -0000 1.3
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: Tsar.cpp,v 1.2 2007/11/05 15:49:29 r_sijrier Exp $
+$Id: Tsar.cpp,v 1.3 2007/12/11 17:30:11 r_sijrier Exp $
*/
#include "Tsar.h"
@@ -211,7 +211,7 @@
* @param signalSignature The 'signature' of the calling objects signal
(equals the name of the signal function)
* @return The newly created event.
*/
-TsarEvent Tsar::create_event( QObject* caller, void* argument, char*
slotSignature, char* signalSignature )
+TsarEvent Tsar::create_event( QObject* caller, void* argument, const char*
slotSignature, const char* signalSignature )
{
PENTER3;
TsarEvent event;
Index: src/common/Tsar.h
===================================================================
RCS file: /sources/traverso/traverso/src/common/Tsar.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/common/Tsar.h 5 Nov 2007 15:49:29 -0000 1.2
+++ src/common/Tsar.h 11 Dec 2007 17:30:11 -0000 1.3
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: Tsar.h,v 1.2 2007/11/05 15:49:29 r_sijrier Exp $
+$Id: Tsar.h,v 1.3 2007/12/11 17:30:11 r_sijrier Exp $
*/
#ifndef TSAR_H
@@ -76,7 +76,7 @@
Q_OBJECT
public:
- TsarEvent create_event(QObject* caller, void* argument, char*
slotSignature, char* signalSignature);
+ TsarEvent create_event(QObject* caller, void* argument, const char*
slotSignature, const char* signalSignature);
void add_event(TsarEvent& event);
void add_rt_event(TsarEvent& event);
Index: src/core/FadeCurve.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/FadeCurve.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/core/FadeCurve.h 19 Nov 2007 11:18:53 -0000 1.15
+++ src/core/FadeCurve.h 11 Dec 2007 17:30:11 -0000 1.16
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: FadeCurve.h,v 1.15 2007/11/19 11:18:53 r_sijrier Exp $
+$Id: FadeCurve.h,v 1.16 2007/12/11 17:30:11 r_sijrier Exp $
*/
#ifndef FADE_CURVE_H
@@ -71,7 +71,7 @@
QList<QPointF> get_control_points();
bool is_bypassed() const {return m_bypass;}
- bool is_smaller_then(APILinkedListNode* node) {return false;}
+ bool is_smaller_then(APILinkedListNode* node) {Q_UNUSED(node); return
false;}
void set_range(double pos);
void set_mode(int m);
Index: src/core/Song.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- src/core/Song.h 29 Nov 2007 19:52:18 -0000 1.76
+++ src/core/Song.h 11 Dec 2007 17:30:11 -0000 1.77
@@ -139,7 +139,7 @@
bool is_changed() const {return changed;}
bool is_snap_on() const {return m_isSnapOn;}
bool is_recording() const {return m_recording;}
- bool is_smaller_then(APILinkedListNode* node) {return false;}
+ bool is_smaller_then(APILinkedListNode* node) {Q_UNUSED(node); return
false;}
void disconnect_from_audiodevice();
void connect_to_audiodevice();
Index: TODO
===================================================================
RCS file: /sources/traverso/traverso/TODO,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- TODO 7 Dec 2007 20:27:23 -0000 1.16
+++ TODO 11 Dec 2007 17:30:11 -0000 1.17
@@ -1,5 +1,6 @@
TOBEDONE FOR 0.4x.x
+* fix compile warnings with g++ >= 4.2.1
* Loading Project with 0 sheets crashes when spectrum/correlation meters are
shown
* http://traverso-daw.org/forum/index.php/topic,60.msg161.html#msg161
(random crashes on mac os x, unable to reproduce locally)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso src/audiofileio/encode/VorbisAudioWrit...,
Remon Sijrier <=