.gitignore

@@ -0,0 +1,4 @@
+objects*/
+mp3-add-ons/encoder/objects*/
+mp3-add-ons/encoder/blade/objects*/
+mp3-add-ons/writer/objects*/

Headers/AppUtils.h

@@ -16,6 +16,8 @@
 #define __APPUTILS_H__
 
 #include <Bitmap.h>
+#include <NodeInfo.h>
+#include <TextControl.h>
 
 //	Enums
 typedef enum

Headers/CDDBLooper.h

@@ -81,7 +81,7 @@ class CDDBLooper : public BLooper
 		// Performs a query command
 		void CDDBQuery(unsigned long discID, int32 numTracks, cddb_toc *cdtoc);
 		// Performs a read command
-		void CDDBRead(const char *category, char *discid);
+		void CDDBRead(const char *category, const char *discid);
 		// Performs a sites command
 		void CDDBSites();
 		// Performs a write command

Headers/DebugBuild.h

@@ -22,16 +22,15 @@
 #endif
 // NOTE: the PPC compiler requires that this value be either 0 or
 // 1. bool values (true/false) don't work.
-#define DEBUG 1
+#define DEBUG 0
+
+#include <stdlib.h>
 
-// Include Be debug support (ASSERT etc.)
-#include <support/Debug.h>
 #include <MediaDefs.h>				// for media_format
-#include <Alert.h>					// for BAlert
+//#include <Alert.h>					// for BAlert
 
-inline void do_nothing(...) 
-{
-}
+// Include Be debug support (ASSERT etc.)
+#include <support/Debug.h>
 
 // Define some debug dependent messages
 #ifdef DEBUG
@@ -40,17 +39,17 @@ inline void do_nothing(...)
 	#define PRINTF				printf
 	#define	FUNCTION			printf
 	#define PROGRESS			printf
-	#define LOOP				do_nothing
+	#define LOOP				(void)0
 #else
-	#define MESSAGE				do_nothing
-	#define ERROR				do_nothing
-	#define PRINTF				do_nothing
-	#define	FUNCTION			do_nothing
-	#define PROGRESS			do_nothing
-	#define LOOP				do_nothing
+	#define MESSAGE				(void)0
+	#define ERROR				(void)0
+	#define PRINTF				(void)0
+	#define	FUNCTION			(void)0
+	#define PROGRESS			(void)0
+	#define LOOP				(void)0
 #endif
 
-
+/*
 // Some preformatted debug dumps
 inline void DumpRect(BRect theRect)
 {
@@ -99,14 +98,18 @@ inline void DumpMediaFormat(const media_format& f)
 		MESSAGE("no details available for format");
 #endif
 }
+*/
 
+/*
 // A debug only alert message
 inline void DebugAlert(const char *theString)
 {
 #if DEBUG
-	BAlert *theAlert = new BAlert("Debug", theString, "Thanks");
-	theAlert->Go();
+//	BAlert *theAlert = new BAlert("Debug", theString, "Thanks");
+//	theAlert->Go();
+	MESSAGE(theString);
 #endif
 }
+*/
 
 #endif	// __DEBUGBUILD_H__

Headers/RipperApp.h

@@ -9,6 +9,8 @@
 
 #include <Application.h>
 
+#include <string.h>
+
 //	Class Definition
 class RipperApp : public BApplication
 { 

Headers/TID3Dialog.h

@@ -15,6 +15,8 @@
 #define __TID3DIALOG_H__
 
 //	Includes
+#include <MenuField.h>
+#include <TextControl.h>
 #include <Window.h>
 #include "id3tag.h"
 

Headers/TInexactMatchWindow.h

@@ -25,6 +25,7 @@
 #define MATCH_INVOKE_MSG	'maIN'
 
 //	Includes
+#include <ListView.h>
 #include <Window.h>
 
 //	Class Definition

Headers/TInfoDialog.h

@@ -16,6 +16,7 @@
 
 //	Includes
 #include <Window.h>
+#include <MenuField.h>
 #include <Message.h>
 
 //	Forward declarations

Headers/TProgressDialog.h

@@ -16,10 +16,14 @@
 #define __TPROGRESSDIALOG_H__
 
 //	Includes
-#include <scsi.h> 
+#include <scsi.h>
+#include <Entry.h>
+#include <FilePanel.h>
+#include <NodeInfo.h>
 #include <Window.h>
 #include <MessageFilter.h>
 #include <Volume.h>
+#include <StatusBar.h>
 #include <String.h>
 #include <StringView.h>
 #include <netdb.h>

Headers/TRefFilter.h

@@ -33,7 +33,7 @@ class TRefFilter : public BRefFilter
 	public:
 		TRefFilter(FilterType filterType);
 
-		bool	Filter(const entry_ref *, BNode *, struct stat *, const char *mimetype);
+		virtual bool Filter(const entry_ref *, BNode *, struct stat_beos *, const char *mimetype);
 
 	private:
 		FilterType m_FilterType;

Headers/TSettingsDialog.h

@@ -15,7 +15,11 @@
 #define __TSETTINGSDIALOG_H__
 
 //	Includes
+#include <CheckBox.h>
+#include <FilePanel.h>
+#include <MenuField.h>
 #include <Window.h>
+
 #include "TProgressDialog.h"
 
 //	Forward Declarations

Headers/cddb.h

@@ -7,29 +7,30 @@
 
 #include <Application.h>
 
-typedef struct  {
+struct cddb_toc
+{
 	int32 min;
 	int32 sec;
 	int32 frame;
-} cddb_toc;
+};
 
-typedef struct
+struct cddb_track_info
 {
 	uchar track_num;
 	char track_name[64];
 	struct cddb_toc start;
 	struct cddb_toc end;
 	struct cddb_toc length;
-}cddb_track_info;
+};
 
-typedef struct
+struct cd_info
 {
 	char disc_title[64];
 	char disc_artist[64];
 	int32 numtracks;
 	struct cddb_track_info track[100];
 	int32 playOrder[100];
 	int32 shuffleIndex;
-}cd_info;
+};
 
 #endif

Headers/id3file.h

@@ -21,12 +21,20 @@
 
 #ifndef __FILE_H__
 #define __FILE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 int add_to_log (char *);
 int id3_read_file (char *, unsigned long, FILE *, char *);
 int id3_write_file (char *, unsigned long, FILE *, char *);
 int id3_open_file (FILE **, char *, char *);
 int id3_seek_header (FILE *, char *);
 int strip_tag (long, char *);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __FILE_H__ */

Headers/id3ren.h

@@ -1,5 +1,9 @@
 #ifndef __ID3REN_H__
 #define __ID3REN_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef struct
 {
@@ -42,7 +46,10 @@ typedef struct
 	/* 0-default 1-upper 2-lower */
 	short ulcase;
 } FLAGS_struct;
-
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __ID3REN_H__ */
 

Headers/id3tag.h

@@ -17,12 +17,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
  * USA.
- */
-
+ */
 
 #ifndef __ID3TAG_H__
-#define __ID3TAG_H__
-
+#define __ID3TAG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define TAGLEN_TAG 		3
 #define TAGLEN_SONG 	30
@@ -46,8 +48,12 @@ typedef struct ID3_struct
 
 void	resize_tag_field (char *);
 bool 	get_tag_genre (int *, int);
-bool	write_tag (bool, char *, ID3_tag *ptrtag);
+bool	write_tag (bool append_flag, char *fn, ID3_tag *ptrtag);
 bool	read_tag (FILE *, char *, ID3_tag *ptrtag);
-bool	tag_file (char *, ID3_tag *ptrtag);
+bool	tag_file (char *, ID3_tag *ptrtag);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __ID3TAG_H__ */