Thread: [Wired-commits] SF.net SVN: wired:[1518] trunk/wired/src

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1518
          http://wired.svn.sourceforge.net/wired/?rev=1518&view=rev
Author:   hdoomsday
Date:     2009-02-09 22:53:37 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
fixed include errors appearing with GCC >= 4.3

Modified Paths:
--------------
    trunk/wired/src/midi/MidiFile.cpp
    trunk/wired/src/midi/MidiFile.h
    trunk/wired/src/plugins/beatbox/BeatButton.h
    trunk/wired/src/plugins/chorus/WvIn.cpp
    trunk/wired/src/redist/Polyphony.cpp
    trunk/wired/src/redist/Polyphony.h

Modified: trunk/wired/src/midi/MidiFile.cpp
===================================================================

--- trunk/wired/src/midi/MidiFile.cpp	2008-08-02 17:14:49 UTC (rev 1517)
+++ trunk/wired/src/midi/MidiFile.cpp	2009-02-09 22:53:37 UTC (rev 1518)
@@ -1,6 +1,8 @@
 // Copyright (C) 2004-2007 by Wired Team
 // Under the GNU General Public License Version 2, June 1991
 
+#include <algorithm>
+
 #include "MidiFile.h"
 #include  "Sequencer.h"
 #include <fcntl.h>
@@ -13,6 +15,8 @@
 #include <wx/filename.h>
 #include <iostream>
 
+using namespace	std;
+
 void	MakeMidiFileName(wxString &filename, unsigned long seqTrackIndex)
 {
   wxString ext = wxT("mid");
@@ -141,7 +145,6 @@
     ppqn = DEFAULT_MIDI_PPQN;
   ratio = (double)Seq->SigNumerator * (double)ppqn;
 
-
   cout << "[MidiTrack] MidiTrack() creating MidiTrack from list of midi events" << endl;
   cout << " ppqn " << (int)ppqn << endl;
   cout << " position ratio " << ratio << endl;

Modified: trunk/wired/src/midi/MidiFile.h
===================================================================
--- trunk/wired/src/midi/MidiFile.h	2008-08-02 17:14:49 UTC (rev 1517)
+++ trunk/wired/src/midi/MidiFile.h	2009-02-09 22:53:37 UTC (rev 1518)
@@ -11,12 +11,10 @@
 #include <wx/file.h>
 #include <wx/defs.h>
 
-#include <algorithm>
 #include <vector>
 
 #include "midi.h"
 
-using namespace std;
 using std::vector;
 
 // the name of the default midi filename (without extension)

Modified: trunk/wired/src/plugins/beatbox/BeatButton.h
===================================================================
--- trunk/wired/src/plugins/beatbox/BeatButton.h	2008-08-02 17:14:49 UTC (rev 1517)
+++ trunk/wired/src/plugins/beatbox/BeatButton.h	2009-02-09 22:53:37 UTC (rev 1518)
@@ -50,7 +50,7 @@
 class BeatButton : public wxWindow
 {
  public:
-  BeatButton(wxWindow* parent, wxWindowID id, const wxPoint& pos, 
+  BeatButton(wxWindow* parent, wxWindowID id, const wxPoint& pospoint, 
 	     const wxSize& size, wxBitmap** bitmaps, unsigned int pos);
   ~BeatButton();
   unsigned int* GetData() { return Data; }

Modified: trunk/wired/src/plugins/chorus/WvIn.cpp
===================================================================
--- trunk/wired/src/plugins/chorus/WvIn.cpp	2008-08-02 17:14:49 UTC (rev 1517)
+++ trunk/wired/src/plugins/chorus/WvIn.cpp	2009-02-09 22:53:37 UTC (rev 1518)
@@ -45,11 +45,17 @@
 */
 /***************************************************/
 
-#include "WvIn.h"
+#include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/types.h>
+#include <unistd.h>
+
+#include <cstdio>
+#include <string>
 #include <math.h>
 
+#include "WvIn.h"
+
+
 WvIn :: WvIn()
 {
   init();

Modified: trunk/wired/src/redist/Polyphony.cpp
===================================================================
--- trunk/wired/src/redist/Polyphony.cpp	2008-08-02 17:14:49 UTC (rev 1517)
+++ trunk/wired/src/redist/Polyphony.cpp	2009-02-09 22:53:37 UTC (rev 1518)
@@ -1,10 +1,14 @@
 // Copyright (C) 2004-2007 by Wired Team
 // Under the GNU General Public License Version 2, June 1991
 
+#include <string.h>
+
 #include "Polyphony.h"
 
 #define BUFSIZE 4096
 
+using namespace	std;
+
 Polyphony::Polyphony()
 {
   buffer_size = BUFSIZE;
@@ -35,7 +39,6 @@
   Poly *voice;
 
   //std::cout << "[POLYPHONY] Setting polyphony to: " << p << std::endl;
-  fflush(stdout);  
   PolyphonyCount = p;
   for (j = 0; j < count; j++)
     {
@@ -50,13 +53,10 @@
     }
 }
 
-#include <stdio.h>
-
 void Polyphony::SetBufferSize(int size)
 {
   buffer_size = size;
   //std::cout << "[POLYPHONY] Buffer size: " << buffer_size << std::endl;
-  fflush(stdout);
   //  OnChangeSettings();
 }
 
@@ -70,8 +70,7 @@
 	return (*i)->Buffer;
       }
   //std::cout << "[POLYPHONY] Returning No Buffer !!!" << std::endl;
-  fflush(stdout);  
-  return (0x0);
+  return (NULL);
 }
 
 void Polyphony::SetFreeBuffer(float **f)

Modified: trunk/wired/src/redist/Polyphony.h
===================================================================
--- trunk/wired/src/redist/Polyphony.h	2008-08-02 17:14:49 UTC (rev 1517)
+++ trunk/wired/src/redist/Polyphony.h	2009-02-09 22:53:37 UTC (rev 1518)
@@ -4,11 +4,8 @@
 #ifndef __POLYPHONY_H__
 #define __POLYPHONY_H__
 
-#include <string.h>
 #include <list>
 
-using namespace std;
-
 typedef struct
 {
   bool  IsFree;
@@ -35,7 +32,7 @@
   long		buffer_size;
   int		PolyphonyCount;
   float		Volume;
-  list<Poly *> Voices;
+  std::list<Poly *> Voices;
 
 };
 #endif//__POLYPHONY_H__


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Wired-commits] SF.net SVN: wired:[1518] trunk/wired/src

wired-commits