Updated version to 1.7, since a couple of the bugs fixed recently also

affect OS4, so a new release will be needed for all platforms. removed all deprecated system calls on os4
pete-gordon · Oct 21, 2012 · 9d67d78 · 9d67d78
1 parent 9a4e5f2
commit 9d67d78
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 22 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,19 @@
+1.7 xx-xxx-2012
+===============
+
+All platforms:
+
+- Fixed some crash bugs when closing tabs under certain circumstances
+- Fixed some memory leaks
+- Added an SDL wrapper that allows HivelyTracker to build for other
+  platforms (Windows, OSX..)
+
+
+OS4:
+
+- Replaced some deprecated system calls with newer OS4 APIs
+
+
 1.6 22-Oct-2008
 ===============
 

diff --git a/about.c b/about.c
@@ -55,7 +55,7 @@ struct rawbm stuff_bm;
 int16 slice[320/2];
 float64 sinpos = 0, cospos = 0;
 
-TEXT *scrtxt = " hivelytracker version 1.6  ::  code by xeron of iris  "
+TEXT *scrtxt = " hivelytracker version 1.7  ::  code by xeron of iris  "
                "::  gui design and skins created by spot of up rough  "
                "::  example tunes by xeron of iris, varthall of up rough, oxide of sonik and syphus  "
                "::  hivelytracker is based on ahx by dexter and pink of abyss  "
@@ -131,7 +131,7 @@ BOOL about_init( void )
   int32 r, g, b, i;
 
 #ifndef __SDL_WRAPPER__
-  ab_tioport = IExec->CreateMsgPort();
+  ab_tioport = IExec->AllocSysObjectTags(ASOT_PORT, TAG_DONE);
   if( !ab_tioport )
   {
     printf( "Unable to create message port\n" );
@@ -140,7 +140,10 @@ BOOL about_init( void )
 
   about_timesig = 1L<<ab_tioport->mp_SigBit;
 
-  ab_tioreq = (struct TimeRequest *)IExec->CreateIORequest( ab_tioport, sizeof( struct TimeRequest ) );
+  ab_tioreq = (struct TimeRequest *)IExec->AllocSysObjectTags(ASOT_IOREQUEST,
+    ASOIOR_ReplyPort, ab_tioport,
+    ASOIOR_Size,      sizeof( struct TimeRequest ),
+    TAG_DONE);
   if( !ab_tioreq )
   {
     printf( "Unable to create io request!\n" );
@@ -287,8 +290,8 @@ void about_shutdown( void )
     }
     IExec->CloseDevice( (struct IORequest *)ab_tioreq );
   }
-  if( ab_tioreq )   IExec->DeleteIORequest( (struct IORequest *)ab_tioreq );
-  if( ab_tioport )  IExec->DeleteMsgPort( ab_tioport );
+  if( ab_tioreq )   IExec->FreeSysObject( ASOT_IOREQUEST, ab_tioreq );
+  if( ab_tioport )  IExec->FreeSysObject( ASOT_PORT, ab_tioport );
 
   about_bm.bm = NULL;
   afont_bm.bm = NULL;
@@ -319,8 +322,8 @@ void about_open( void )
     WA_Top,         ab_y,
     WA_InnerWidth,  320,
     WA_InnerHeight, 240,
-    WA_Title,       "HivelyTracker v1.6",
-    WA_ScreenTitle, "HivelyTracker (c)2008 IRIS & Up Rough! - http://www.irishq.dk - http://www.uprough.net - http://www.hivelytracker.com",
+    WA_Title,       "HivelyTracker v1.7",
+    WA_ScreenTitle, "HivelyTracker (c)2012 IRIS & Up Rough! - http://www.irishq.dk - http://www.uprough.net - http://www.hivelytracker.com",
     WA_RMBTrap,     TRUE,
     WA_IDCMP,       IDCMP_CLOSEWINDOW,  //|IDCMP_MOUSEBUTTONS,
     WA_Activate,    TRUE,

diff --git a/ht.c b/ht.c
@@ -23,7 +23,7 @@ extern uint32 about_sigs;
 
 extern struct List *rp_tunelist;
 
-TEXT __attribute((used)) ver[] = "$VER: HivelyTracker 1.6 (03.08.2008)";
+TEXT __attribute((used)) ver[] = "$VER: HivelyTracker 1.7 (21.10.2012)";
 
 void SetAmiUpdateENVVariable( TEXT *varname )
 {

diff --git a/replay.c b/replay.c
@@ -3642,13 +3642,16 @@ BOOL rp_subtask_init( void )
 {
   if( !rp_alloc_buffers() ) return FALSE;
 
-  rp_msgport = IExec->CreateMsgPort();
+  rp_msgport = IExec->AllocSysObjectTags(ASOT_PORT, TAG_DONE);
   if( !rp_msgport ) return FALSE;
 
-  ahi_mp = IExec->CreateMsgPort();
+  ahi_mp = IExec->AllocSysObjectTags(ASOT_PORT, TAG_DONE);
   if( !ahi_mp ) return FALSE;
 
-  ahi_io[0] = (struct AHIRequest *)IExec->CreateIORequest( ahi_mp, sizeof( struct AHIRequest ) );
+  ahi_io[0] = (struct AHIRequest *)IExec->AllocSysObjectTags(ASOT_IOREQUEST,
+    ASOIOR_ReplyPort, ahi_mp,
+    ASOIOR_Size,      sizeof( struct AHIRequest ),
+    TAG_DONE);
   if( ahi_io[0] == NULL ) return FALSE;
 
   ahi_io[0]->ahir_Version = 4;
@@ -3660,29 +3663,27 @@ BOOL rp_subtask_init( void )
   IAHI = (struct AHIIFace *)IExec->GetInterface( AHIBase, "main", 1, NULL );
   if( !IAHI ) return FALSE;
 
-  ahi_io[1] = IExec->AllocVec( sizeof( struct AHIRequest ), MEMF_ANY );
+  ahi_io[1] = IExec->AllocSysObjectTags(ASOT_IOREQUEST, ASOIOR_Size, sizeof( struct AHIRequest ), ASOIOR_Duplicate, ahi_io[0], TAG_DONE );
   if( ahi_io[1] == NULL ) return FALSE;
 
-  IExec->CopyMem( ahi_io[0], ahi_io[1], sizeof( struct AHIRequest ) );
-
   return TRUE;
 }
 
 void rp_subtask_shut( void )
 {
-  if( ahi_io[1] )     IExec->FreeVec( ahi_io[1] );
   if( IAHI )          IExec->DropInterface( (struct Interface *)IAHI );
   if( ahi_dev != -1 )
   {
     IExec->CloseDevice( (struct IORequest *)ahi_io[0] );
-    IExec->DeleteIORequest( (struct IORequest *)ahi_io[0] );
+    IExec->FreeSysObject( ASOT_IOREQUEST, ahi_io[0] );
   }
-  if( ahi_mp )        IExec->DeleteMsgPort( ahi_mp );
+  if( ahi_io[1] )     IExec->FreeSysObject( ASOT_IOREQUEST, ahi_io[1] );
+  if( ahi_mp )        IExec->FreeSysObject( ASOT_PORT, ahi_mp );
   if( rp_msgport )
   {
     struct Message *msg;
     while( ( msg = IExec->GetMsg( rp_msgport ) ) ) IExec->ReplyMsg( msg );
-    IExec->DeleteMsgPort( rp_msgport );
+    IExec->FreeSysObject( ASOT_PORT, rp_msgport );
     rp_msgport = NULL;
   }
   if( rp_audiobuffer[0] ) IExec->FreePooled( rp_mempool, rp_audiobuffer[0], rp_audiobuflen * 2 );
@@ -4017,7 +4018,7 @@ BOOL rp_init( void )
   }
 
 #ifndef __SDL_WRAPPER__
-  rp_replyport = IExec->CreateMsgPort();
+  rp_replyport = IExec->AllocSysObject(ASOT_PORT, TAG_DONE);
   if( !rp_replyport )
   {
     printf( "Unable to create a message port\n" );
@@ -4119,7 +4120,7 @@ void rp_shutdown( void )
 
   if( rp_mainmsg )   IExec->FreeSysObject( ASOT_MESSAGE, rp_mainmsg );
 
-  if( rp_replyport ) IExec->DeleteMsgPort( rp_replyport );
+  if( rp_replyport ) IExec->FreeSysObject( ASOT_PORT, rp_replyport );
 
   if( rp_mempool )  IExec->FreeSysObject( ASOT_MEMPOOL, rp_mempool );  
 

diff --git a/sdl/ht.c b/sdl/ht.c
@@ -53,7 +53,7 @@ BOOL init( void )
     return FALSE;
   }
 
-  SDL_WM_SetCaption( "HivelyTracker SDL", "HivelyTracker SDL" );
+  SDL_WM_SetCaption( "HivelyTracker 1.7", "HivelyTracker 1.7" );
 
   SDL_EnableKeyRepeat(500, 30);
 

diff --git a/util.c b/util.c
@@ -9,7 +9,7 @@
 */
 BOOL getLibIFace( struct Library **libbase, TEXT *libname, uint32 version, void *ifaceptr )
 {
-  struct Interface **ifptr = (struct interface **)ifaceptr;
+  struct Interface **ifptr = (struct Interface **)ifaceptr;
 
   *libbase = IExec->OpenLibrary( libname, version );
   if( *libbase == NULL )