Ignore:
Timestamp:
Oct 1, 2023, 4:30:02 PM (23 months ago)
Author:
erdmann
Message:

merging v2.9 into v2.9_Lars branch, in particular, this means adding french,spanish,russian translations

Location:
branches/v2.9_Lars
Files:
25 edited
23 copied
2 moved

Legend:

Unmodified
Added
Removed

  • branches/v2.9_Lars

  • branches/v2.9_Lars/mediafolder/Help/makefile

    r4 r91  
    1515       
    1616mediafldr.hlp:  mediafldr.ipf mediafldr049.ipf mediafldr031.ipf mediafldr039.ipf \
    17                 mediafldr_ecs.ipf mediafldr049_ecs.ipf mediafldr031_ecs.ipf mediafldr039_ecs.ipf
     17               mediafldr033.ipf mediafldr034.ipf \
     18                mediafldr_ecs.ipf mediafldr049_ecs.ipf mediafldr031_ecs.ipf mediafldr039_ecs.ipf \
     19               mediafldr033_ecs.ipf
    1820ifdef    ECS_COMPILE
    1921        ipfc mediafldr_ecs.ipf mediafldr.hlp
    … …  
    2123        ipfc mediafldr031_ecs.ipf mediafldr031.hlp
    2224        ipfc mediafldr039_ecs.ipf mediafldr039.hlp
    23         ipfc mediafldr088_ecs.ipf mediafldr088.hlp
     25        ipfc mediafldr088_ecs.ipf mediafldr088.hlp     
     26        ipfc mediafldr033_ecs.ipf mediafldr033.hlp
    2427else
    2528        ipfc mediafldr.ipf
    … …  
    2730        ipfc mediafldr031.ipf
    2831        ipfc mediafldr039.ipf
    29         ipfc mediafldr088.ipf
     32        ipfc mediafldr088.ipf   
     33        ipfc mediafldr033.ipf
     34        ipfc mediafldr034.ipf
    3035endif
    3136
    … …  
    4348
    4449distribution:
    45 

  • branches/v2.9_Lars/mediafolder/Help/mediafldr.ipf

    r2 r91  
    11:userdoc.
    22
    3 :docprof.
    4 
    5 :title.Help for Media Folder distribution 
    6 
    7 :h1 res=100.Help for Media Player
    8 :p.
    9 This object is a Media-Folder. Put any audio file into it
    10 for playing. Specify the order of the tracks using drag and drop.
    11 The usual play controls are available like play, stop or volume.
    12 :p.
    13 More information and updates:
    14 :p.
    15 :link reftype=launch
    16 object='netscape.exe'
    17 data='http://www.os2world.com/cdwriting'.
    18 http&colon.//www.os2world.com/cdwriting:elink.
    19 .br
    20 :link reftype=launch
    21 object='netscape.exe'
    22 data='http://www.geocities.com/SiliconValley/Sector/5785/'.
    23 http&colon.//www.geocities.com/SiliconValley/Sector/5785/:elink.
    24 :p.
     3:docprof toc=123456.
     4
     5:title.Help for Media Folder distribution
     6
     7.* ----------------------------------------------------------------------------
     8:h1 res=100 name=mplayer
     9    x=left y=bottom width=100% height=100%.Media player
     10
     11This object is a Media folder. Drag one or more audio files into it for
     12playing. To reorder, ensure that View | Sort > Always maintain sort order option
     13is deselected, as well as any other sort options which might affect manual
     14ordering, and drag and drop tracks into the folder as desired.
     15
     16:p.Use the buttons or :link reftype=hd refid=mkeyboard.Keyboard:elink. to
     17control playback. The Repeat checkbox will cause the currently selected track to
     18continuously replay. The Random checkbox will select tracks arbitrarily, unless
     19the Repeat checkbox has been set.
     20
     21:p.More information and updates&colon.
     22
     23:p.https&colon.//trac.netlabs.org/cwmmclasses/wiki
     24
    2525:nt.
    26 :p.
    27 For playing of MP3 files you need the MMIOMP3 procedure written
    28 by Russell O'Connor.
    29 :p.
    30 Get it from
    31 :p.
    32 :link reftype=launch
    33 object='netscape.exe'
    34 data='http://www.math.berkeley.edu/~roconnor/'.
    35 http&colon.//www.math.berkeley.edu/~roconnor/:elink.
     26A suitable MP3 MMIOProc is required in order to play MP3 files, as is a suitable
     27MMIOProc for Ogg (Vorbis and FLAC) files. These are included in the MMAudio Pak
     282, available from&colon.
     29
     30:p.http&colon.//r6.ca/MMAudioPak/
     31
     32:p.(Ogg formats are supported by default in ArcaOS 5.x and above.)
    3633:ent.
    37 :p.
    38 :hp2.Keyboard control:ehp2.
    39 :p.
    40 Use the following keys to control the media folder. The buttons in the upper part
    41 of the folder must have the focus when using the keys. Use :hp2.TAB:ehp2. to switch
    42 the focus from the container to the buttons.
    43 :p.
    44 :ul.
    45 :li.:hp8.B:ehp8.ack
    46 :li.:hp8.S:ehp8.top
    47 :li.:hp8.P:ehp8.ause
    48 :li.P:hp8.l:ehp8.ay
    49 :li.:hp8.N:ehp8.ext
    50 :li.:hp8.R:ehp8.epeat
     34
     35.* ----------------------------------------------------------------------------
     36:h2 res=110 name=mview
     37    x=left y=bottom width=100% height=100%.View options
     38
     39By default, Media folders are displayed in Details view, listing track-
     40specific details for each file or object which has been added to the main
     41folder.
     42
     43:p.To switch to Compact view, select View | Compact from the main menu. In this
     44mode, the folder content is hidden, however,
     45:link reftype=hd refid=mlaunchpad.Launchpad:elink. buttons will be visible.
     46
     47:note text='Tip:'.Select files to play contiguously, reordering folder content
     48if necessary, click :hp2.Play:ehp2., and then change the view to Compact.
     49
     50.* ----------------------------------------------------------------------------
     51:h2 res=120 name=mkeyboard
     52    x=left y=bottom width=100% height=100%.Keyboard control
     53
     54Use the following keys to control the Media folder. The buttons in the upper
     55part of the folder must have focus when using these keys. Use
     56:hp2.&lt.Tab&gt.:ehp2. to switch the focus from the container to the buttons.
     57
     58:ul compact.
     59:li.:hp2.B:ehp2.ack
     60:li.:hp2.S:ehp2.top
     61:li.:hp2.P:ehp2.ause
     62:li.P:hp2.l:ehp2.ay
     63:li.:hp2.N:ehp2.ext
     64:li.:hp2.R:ehp2.epeat
     65:li.R:hp2.a:ehp2.ndom
    5166:eul.
    5267
    53 :h1 res=200.Help for CD-Player
    54 :p.
    55 This object is a CD player with FreeDB support. Tracktitles and other information
    56 are queried from a FreeDB server if an internet connection is available.
    57 :p.
    58 More information and updates:
    59 :p.
    60 :link reftype=launch
    61 object='netscape.exe'
    62 data='http://www.os2world.com/cdwriting'.
    63 http&colon.//www.os2world.com/cdwriting:elink.
    64 .br
    65 :link reftype=launch
    66 object='netscape.exe'
    67 data='http://www.geocities.com/SiliconValley/Sector/5785/'.
    68 http&colon.//www.geocities.com/SiliconValley/Sector/5785/:elink.
    69 :p.
     68.* ----------------------------------------------------------------------------
     69:h2 res=130 name=mvolume
     70    x=left y=bottom width=100% height=100%.Volume slider
     71
     72Below the player buttons is the Volume slider. This controls the volume level
     73for playback, within the limits set by the Master volume control for the system.
     74
     75.* ----------------------------------------------------------------------------
     76:h2 res=140 name=mtrackpos
     77    x=left y=bottom width=100% height=100%.Track position slider
     78
     79To the right of the player buttons is the Track position slider. Drag the
     80slider forward or back to reposition the playback point of the current file.
     81
     82.* ----------------------------------------------------------------------------
     83:h2 res=150 name=mlaunchpad
     84    x=left y=bottom width=100% height=100%.Launchpad
     85
     86Toward the lower left of the player folder is a square box. Drag and drop a
     87media file on the Launchpad to add it to the palette. The filename is displayed
     88in the button's tooltip. Drag and drop additional files in between existing
     89items in the Launchpad or to the right of the last item. Click any one of these
     90to begin playing it.
     91
     92:p.The Launchpad is common across all Media, CD player, and M3U playlist
     93folders.
     94
     95:note.When play is started in this manner, the
     96:link reftype=hd refid=mtrackpos.Track position slider:elink. does not reflect
     97the current playback state, and the player buttons do not control playback. Use
     98the button's context menu to control playback, instead.
     99
     100:warning.While it is possible to add MP3, Ogg, and other digital media files to
     101the Launchpad, do not add CD tracks here. CD tracks will not be playable from
     102the Launchpad.
     103
     104.* ----------------------------------------------------------------------------
     105:h1 res=200 name=cplayer
     106    x=left y=bottom width=100% height=100%.CD player
     107
     108This object is a CD player with CDDB support. Track titles and other metadata
     109are queried from a configured FreeDB-compatible server if an internet connection
     110is available.
     111
     112:p.More information and updates&colon.
     113
     114:p.https&colon.//trac.netlabs.org/cwmmclasses/wiki
     115
    70116:nt.
    71 To use FreeDB servers you have to install the appropriate package and you must
    72 specify an email address. Use the configuration object to do so.
     117Most CDDB servers follow the FreeDB practice of requiring a valid email address
     118for access. Use the FreeDB Client configuration object in the Multimedia folder
     119to set this.
    73120:ent.
    74 :p.
    75 :hp2.Keyboard control:ehp2.
    76 :p.
    77 Use the following keys to control the player. The buttons in the upper part
    78 of the window must have the focus when using the keys. Use :hp2.TAB:ehp2. to switch
    79 the focus from the container to the buttons.
    80 :p.
    81 :ul.
    82 :li.:hp8.B:ehp8.ack
    83 :li.:hp8.S:ehp8.top
    84 :li.:hp8.P:ehp8.ause
    85 :li.P:hp8.l:ehp8.ay
    86 :li.:hp8.N:ehp8.ext
    87 :li.:hp8.R:ehp8.epeat
     121
     122.* ----------------------------------------------------------------------------
     123:h2 res=210 name=cview
     124    x=left y=bottom width=100% height=100%.View options
     125
     126By default, the CD player is displayed in Details view, listing details for each
     127track on the mounted disc.
     128
     129:p.To switch to Compact view, select View | Compact from the main menu. In this
     130mode, the folder content is hidden, however,
     131:link reftype=hd refid=claunchpad.Launchpad:elink. buttons will be visible.
     132
     133:note text='Tip:'.Select the first track to be played, click :hp2.Play:ehp2., and
     134then change the view to Compact.
     135
     136.* ----------------------------------------------------------------------------
     137:h2 res=220 name=ckeyboard
     138    x=left y=bottom width=100% height=100%.Keyboard control
     139
     140Use the following keys to control the CD Player. The buttons in the upper
     141part of the player must have focus when using these keys. Use
     142:hp2.&lt.Tab&gt.:ehp2. to switch the focus from the container to the buttons.
     143
     144:ul compact.
     145:li.:hp2.B:ehp2.ack
     146:li.:hp2.S:ehp2.top
     147:li.:hp2.P:ehp2.ause
     148:li.P:hp2.l:ehp2.ay
     149:li.:hp2.N:ehp2.ext
     150:li.:hp2.R:ehp2.epeat
    88151:eul.
    89152
    90 :h1 res=300.Help for playlist editor
    91 :p.
    92 Use the playlist editor to create or modify M3U playlists. These playlists
    93 are for example used by portable MP3 players. Such a playlist file is a text file
    94 containing the filenames of every track to be played.
    95 :p.
    96 Weitere Informationen und Updates:
    97 :p.
    98 :link reftype=launch
    99 object='netscape.exe'
    100 data='http://www.os2world.com/cdwriting'.
    101 http&colon.//www.os2world.com/cdwriting:elink.
    102 .br
    103 :link reftype=launch
    104 object='netscape.exe'
    105 data='http://www.geocities.com/SiliconValley/Sector/5785/'.
    106 http&colon.//www.geocities.com/SiliconValley/Sector/5785/:elink.
    107 
     153.* ----------------------------------------------------------------------------
     154:h2 res=230 name=cvolume
     155    x=left y=bottom width=100% height=100%.Volume slider
     156
     157Below the player buttons is the Volume slider. This controls the volume level
     158for playback, within the limits set by the Master volume control for the system.
     159
     160.* ----------------------------------------------------------------------------
     161:h2 res=240 name=ctrackpos
     162    x=left y=bottom width=100% height=100%.Track position slider
     163
     164To the right of the player buttons is the Track position slider. Drag the
     165slider forward or back to reposition the playback point of the current track.
     166
     167.* ----------------------------------------------------------------------------
     168:h2 res=250 name=claunchpad
     169    x=left y=bottom width=100% height=100%.Launchpad
     170
     171Toward the lower left of the player folder is a square box. Drag and drop a
     172media file on the Launchpad to add it to the palette. The filename is displayed
     173in the button's tooltip. Drag and drop additional files in between existing
     174items in the Launchpad or to the right of the last item. Click any one of these
     175to begin playing it.
     176
     177:p.The Launchpad is common across all Media, CD player, and M3U playlist
     178folders.
     179
     180:note.When play is started in this manner, the
     181:link reftype=hd refid=mtrackpos.Track position slider:elink. does not reflect
     182the current playback state, and the player buttons do not control playback. Use
     183the button's context menu to control playback, instead.
     184
     185:warning.While it is possible to add MP3, Ogg, and other digital media files to
     186the Launchpad, do not add CD tracks here. CD tracks will not be playable from
     187the Launchpad.
     188
     189.* ----------------------------------------------------------------------------
     190:h1 res=300 name=peditor
     191    x=left y=bottom width=100% height=100%.Playlist editor
     192
     193Use the Playlist editor to modify M3U playlists. An M3U playlist is a text
     194file which contains paths (URLs) to the tracks it references.
     195
     196:p.M3U (Moving Picture Experts Group Audio Layer 3 Uniform Resource Locator) is
     197a :hp1.de facto:ehp1. standard, generally recognized by most MP3 players.
     198
     199:p.To add tracks, simply drag and drop them into the editor. To reorder, ensure
     200that :hp1.Always maintain sort order:ehp1. option on the :hp2.Sort:ehp2. submenu
     201is deselected, as well as any other sort options which might affect manual
     202ordering, and drag and drop the tracks as desired. Save the playlist by
     203selecting :hp2.File | Save:ehp2. from the menu.
     204
     205:p.To create a new playlist, drag the M3U playlist template from the Multimedia
     206Templates folder to a suitable location on the desktop.
     207
     208:p.More information and updates&colon.
     209
     210:p.https&colon.//trac.netlabs.org/cwmmclasses/wiki
     211
     212.* ----------------------------------------------------------------------------
     213:h2 res=350 name=plaunchpad
     214    x=left y=bottom width=100% height=100%.Launchpad
     215
     216Toward the lower left of the M3U playlist editor is a square box. Drag and drop
     217a media file on the Launchpad to add it to the palette. The filename is
     218displayed in the button's tooltip. Drag and drop additional files in between
     219existing items in the Launchpad or to the right of the last item. Click any one
     220of these to begin playing it.
     221
     222:p.The Launchpad is common across all Media, CD player, and M3U playlist
     223folders.
     224
     225:note.Use the button's context menu to control playback.
     226
     227:warning.While it is possible to add MP3, Ogg, and other digital media files to
     228the Launchpad, do not add CD tracks here. CD tracks will not be playable from
     229the Launchpad.
    108230
    109231:euserdoc.
    110 

  • branches/v2.9_Lars/mediafolder/c/cddb/cddb.cpp

    r40 r91  
    8888    delete(tempTrack);
    8989  }
    90  
     90
    9191  if(nextCddb)delete nextCddb;
    9292
    … …  
    129129  if(tempTrack) {
    130130    /* Yes, add  the rest of the title to that what we already have */
    131     strncat(tempTrack->trackname, track->trackname, sizeof(tempTrack->trackname)-strlen(tempTrack->trackname)-1);   
     131    strncat(tempTrack->trackname, track->trackname, sizeof(tempTrack->trackname)-strlen(tempTrack->trackname)-1);
    132132    delete(track);
    133133    return;
    … …  
    136136  tempTrack=firstTrack;
    137137  while(tempTrack->nextTrack) {
    138     tempTrack=tempTrack->nextTrack; 
     138    tempTrack=tempTrack->nextTrack;
    139139  }
    140140  tempTrack->nextTrack=track;
    141   return; 
     141  return;
    142142}
    143143
    … …  
    152152      return tempTrack;
    153153
    154     tempTrack=tempTrack->nextTrack; 
     154    tempTrack=tempTrack->nextTrack;
    155155  }
    156156
    … …  
    169169
    170170#if 0
    171 /* now defined in printHelper.cpp 
     171/* now defined in printHelper.cpp
    172172   or cddbhelper.cpp. By choosing the right module to link to, it's possible
    173173   to redirect the messages without changing this module. Used for different
    … …  
    191191  fileHandle=open("cddb.out",O_APPEND|O_TEXT|O_WRONLY);
    192192  if(fileHandle==-1) {
    193     printError("Cannot open cddb.out");
     193    printError((char *)"Cannot open cddb.out");
    194194    return;
    195195  }
    … …  
    205205
    206206int readResponse(int s, char * buffer,int size)
    207 { 
     207{
    208208  int a;
    209209  int rc;
    210  
     210
    211211  rc=1;
    212212  for(a=0;a<size&&rc>0;a++) {
    … …  
    217217    }
    218218    if(rc==-1)
    219       return CDDB_ERROR;   
    220   }
    221    
     219      return CDDB_ERROR;
     220  }
     221
    222222  return CDDB_ERROR;
    223223}
    … …  
    237237    case '3': return CDDB_MORE;
    238238    case '4':
    239       printError("CDDB server error");
     239      printError((char *)"CDDB server error");
    240240      return CDDB_ERROR;
    241241    case '5':
    242       printError("CDDB client error");
     242      printError((char *)"CDDB client error");
    243243      return CDDB_ERROR;
    244244    default:
    245       printError("Unknown error");
     245      printError((char *)"Unknown error");
    246246      break;
    247247    }
    … …  
    258258  /* Handshaking */
    259259  if(verbose)
    260     printError("Handshaking...    ");
     260    printError((char *)"Handshaking...    ");
    261261  sprintf(buffer,"cddb hello %s %s %s %s\n",username,hostname,clientname,version);
    262   if(verbose==2) 
     262  if(verbose==2)
    263263    printError(buffer);
    264264  rc=write(s,buffer,strlen(buffer));
    265265  if(rc==-1) {
    266     printError("Handshaking: cannot write to CDDB server");
    267     return -1;
    268   }
    269   if(verbose)
    270     printError("done\n");
    271   if(verbose==2)
    272     printError("Response: ");
    273  
     266    printError((char *)"Handshaking: cannot write to CDDB server");
     267    return -1;
     268  }
     269  if(verbose)
     270    printError((char *)"done\n");
     271  if(verbose==2)
     272    printError((char *)"Response: ");
     273
    274274  rc=readResponse(s,buffer,sizeof(buffer));
    275275  if(rc==CDDB_ERROR) {
    276     printError("Handshaking: cannot get response");
    277     return -1;
    278   }
    279   if(verbose==2) 
     276    printError((char *)"Handshaking: cannot get response");
     277    return -1;
     278  }
     279  if(verbose==2)
    280280    printErrorCR(buffer);
    281  
     281
    282282  if(check_cddb_code(buffer)==CDDB_ERROR)
    283283    return -1;
    … …  
    297297  do {
    298298    if(verbose)
    299       printError("\nSetting protocol level...    ");
     299      printError((char *)"\nSetting protocol level...    ");
    300300    sprintf(buffer,"proto %d\n",iProtLevel);
    301301    printError(buffer);
    302302    rc=write(s,buffer,strlen(buffer));
    303303    if(rc==-1) {
    304       printError("Protocol: cannot write to CDDB server");
     304      printError((char *)"Protocol: cannot write to CDDB server");
    305305      return -1;
    306306    }
    307307    if(verbose)
    308       printError("done\n");
     308      printError((char *)"done\n");
    309309    if(verbose==2)
    310       printError("Response: ");
    311    
     310      printError((char *)"Response: ");
     311
    312312    rc=readResponse(s,buffer,sizeof(buffer));
    313313    if(rc==CDDB_ERROR) {
    314       printError("Set protocol: cannot get response");
     314      printError((char *)"Set protocol: cannot get response");
    315315      return -1;
    316316    }
    317317    if(verbose==2)
    318318      printErrorCR(buffer);
    319    
     319
    320320    /* Check cddb code */
    321321    if(check_cddb_code(buffer)==CDDB_ERROR) {
    … …  
    326326      break;
    327327    /* protocol not supported. Decrement level and try again. */
    328     iProtLevel--;     
     328    iProtLevel--;
    329329  }while(iProtLevel>0);
    330  
     330
    331331  return 0;
    332332}
    … …  
    343343  do {
    344344    rc=readResponse(s,buffer,sizeof(buffer)); /* Get next line */
    345    
     345
    346346    if(rc==CDDB_ERROR)
    347347      return root; /* return what we have so far */
    … …  
    351351
    352352    /* A new cddb instance for every match */
    353     Cddb=new cddb("","","",1); /* One fuzzy match or one of several matches */
     353    Cddb=new cddb((char *)"",(char *)"",(char *)"",1); /* One fuzzy match or one of several matches */
    354354    /* Get the data for this match */
    355355    sscanf(buffer, " %20s %x %100[^/\r\n] / %100[^\r\n]", Cddb->category,&Cddb->discid,Cddb->artist,Cddb->title);
    … …  
    359359    else
    360360      root->linkCddb(Cddb);
    361    
     361
    362362  }while(true);
    363363
    … …  
    383383  /* Sending query */
    384384  if(verbose)
    385     printError("Sending query cmd...    ");
     385    printError((char *)"Sending query cmd...    ");
    386386  /* Build cmd-line */
    387387  sprintf(buffer,"cddb query %08x %d",cddbInfo->discid,cddbInfo->numTracks);
    … …  
    389389    rc=snprintf(track,sizeof(track)," %d",cddbInfo->startSector[a]);
    390390    if(rc==EOF||rc>=sizeof(track)) {
    391       printError("Query: buffer overrun while formatting track offsets.\nPlease report this bug.\n");
     391      printError((char *)"Query: buffer overrun while formatting track offsets.\nPlease report this bug.\n");
    392392      return 0;
    393393    }
    394394    if(sizeof(buffer)-strlen(buffer) <= strlen(track)) {
    395       printError("Query: buffer overrun while adding track offsets to command.\nPlease report this bug.\n");
     395      printError((char *)"Query: buffer overrun while adding track offsets to command.\nPlease report this bug.\n");
    396396      return 0;
    397397    }
    … …  
    401401  rc=snprintf(track,sizeof(track), " %d\n",cddbInfo->discLength);
    402402  if(rc==EOF||rc>=sizeof(track)) {
    403     printError("Query: buffer overrun while formatting disclength.\nPlease report this bug.\n");
     403    printError((char *)"Query: buffer overrun while formatting disclength.\nPlease report this bug.\n");
    404404    return 0;
    405405  }
    406406  if(sizeof(buffer)-strlen(buffer) <= strlen(track)) {
    407     printError("Query: buffer overrun while adding disclength to command.\nPlease report this bug.\n");
     407    printError((char *)"Query: buffer overrun while adding disclength to command.\nPlease report this bug.\n");
    408408    return 0;
    409409  }
    … …  
    415415  rc=write(s,buffer,strlen(buffer));
    416416  if(rc==-1) {
    417     printError("Query: cannot write to CDDB server");
     417    printError((char *)"Query: cannot write to CDDB server");
    418418    return 0;
    419419  }
    420420  if(verbose)
    421     printError(" done\n");
    422   if(verbose==2)
    423     printError("Response: ");
    424  
     421    printError((char *)" done\n");
     422  if(verbose==2)
     423    printError((char *)"Response: ");
     424
    425425  rc=readResponse(s,buffer,sizeof(buffer));
    426426  //rc=read(s,buffer,sizeof(buffer)-1);
    427427  if(rc==CDDB_ERROR) {
    428     printError("Query: cannot get response");
     428    printError((char *)"Query: cannot get response");
    429429    return 0;
    430430  }
    … …  
    440440    {
    441441    case 200:  /* exact match */
    442       Cddb=new cddb("","","");
     442      Cddb=new cddb((char *)"",(char *)"",(char *)"");
    443443
    444444      sscanf(buffer+4, "%20s %x %100[^/\r\n] / %100[^\r\n]", Cddb->category,&Cddb->discid,Cddb->artist,Cddb->title);
    … …  
    457457  /* We shouldn't reach this */
    458458  return 0;
    459 } 
     459}
    460460
    461461/* Reads the CDDB banner from the server after connecting */
    … …  
    471471  rc=readResponse(s,buffer,sizeof(buffer));
    472472  if(rc==CDDB_ERROR) {
    473     printError("Cannot read CDDB-Banner");
     473    printError((char *)"Cannot read CDDB-Banner");
    474474    return -1;
    475475  }
    … …  
    493493  int iTrack=0;
    494494  int iTemp=0;
    495  
     495
    496496  do{
    497497    rc=readResponse(s,buffer,sizeof(buffer));
    498498    if(rc==CDDB_ERROR) {
    499       printError("Read request: cannot get response");
     499      printError((char *)"Read request: cannot get response");
    500500      return CDDB_ERROR;
    501501    }
    … …  
    504504    if(buffer[0]!='.')
    505505      printData(buffer);
    506    
     506
    507507    if(buffer[0]=='#') /* This is a comment */
    508508      { }
    … …  
    511511      if(buffer[0]=='.') /* End of data */
    512512        return CDDB_OK; /* Done */
    513      
     513
    514514      //printf("Found data: %s\n",buffer);
    515515      sscanf(buffer,"%20[^0-9=]",key);
    … …  
    524524  }while(rc==CDDB_MORE);
    525525
     526  return CDDB_OK;
    526527}
    527528
    … …  
    534535
    535536  /* Build cmd-line */
    536   sprintf(buffer,"cddb read %s %08x\n",Cddb->category,Cddb->discid); 
    537   if(verbose) 
    538     printError("\nSending read cmd... ");
     537  sprintf(buffer,"cddb read %s %08x\n",Cddb->category,Cddb->discid);
     538  if(verbose)
     539    printError((char *)"\nSending read cmd... ");
    539540  if(verbose==2)
    540541    printError(buffer);
    541  
     542
    542543  rc=write(s,buffer,strlen(buffer));
    543544  if(rc==-1) {
    544     printError("Read request: cannot write to CDDB server");
    545     return -1;
    546   }
    547   if(verbose) 
    548     printError("done\n");
    549   if(verbose==2)
    550     printError("Response: ");
    551  
     545    printError((char *)"Read request: cannot write to CDDB server");
     546    return -1;
     547  }
     548  if(verbose)
     549    printError((char *)"done\n");
     550  if(verbose==2)
     551    printError((char *)"Response: ");
     552
    552553  rc=readResponse(s,buffer,sizeof(buffer));
    553554  if(rc==CDDB_ERROR) {
    554     printError("Read request: cannot get response");
    555     return -1;
    556   }
    557   if(verbose==2) 
     555    printError((char *)"Read request: cannot get response");
     556    return -1;
     557  }
     558  if(verbose==2)
    558559    printError(buffer);
    559560  if(check_cddb_code(buffer)==CDDB_ERROR)
    560561    return CDDB_ERROR;
    561562
    562   /* Get the data */ 
     563  /* Get the data */
    563564  read_and_parse(s,Cddb);
    564   return CDDB_OK; 
     565  return CDDB_OK;
    565566}
    566567
    … …  
    577578  /* Creating socket */
    578579  if(verbose)
    579     printError("Creating socket...     ");
     580    printError((char *)"Creating socket...     ");
    580581  s=socket(AF_INET,SOCK_STREAM,0);
    581582  if(s==-1) {
    582     printError("Cannot create socket!");
     583    printError((char *)"Cannot create socket!");
    583584    return -1;
    584585  }
    585586  *skt=s;
    586587  if(verbose)
    587     printError("Socket created\n");
     588    printError((char *)"Socket created\n");
    588589
    589590  /* Querying host */
    590591  if(verbose)
    591     printError("Querying host...     ");
     592    printError((char *)"Querying host...     ");
    592593  he = gethostbyname(host);
    593594  if(he==NULL) {
    594     printError("Cannot get host address.\ngethostbyname() returned error:  ");
     595    printError((char *)"Cannot get host address.\ngethostbyname() returned error:  ");
    595596    switch (h_errno)
    596597      {
    597598      case HOST_NOT_FOUND:
    598         printError("Host not found\n");
     599        printError((char *)"Host not found\n");
    599600        break;
    600601      case TRY_AGAIN:
    601         printError("Temporary error. Try again later.\n");
     602        printError((char *)"Temporary error. Try again later.\n");
    602603        break;
    603604      case NO_DATA:
    604         printError("Name valid but name server has no associated address.\n");
     605        printError((char *)"Name valid but name server has no associated address.\n");
    605606        break;
    606607      case NO_RECOVERY:
    607         printError("Unrecoverable error.\n");
     608        printError((char *)"Unrecoverable error.\n");
    608609        break;
    609610      default:
    610         printError("Unknown error\n");
     611        printError((char *)"Unknown error\n");
    611612      }
    612613    /* Close the socket */
    613614    close(s);
    614615    return -1;
    615   }   
    616 
    617   if(verbose)
    618     printError("Host found.\n");
     616  }
     617
     618  if(verbose)
     619    printError((char *)"Host found.\n");
    619620
    620621
    621622  /* Connecting to host */
    622623  if(verbose)
    623     printError("Connecting to host...    ");
     624    printError((char *)"Connecting to host...    ");
    624625  memset(&sa_in,0, sizeof(struct sockaddr_in));
    625626
    … …  
    634635      {
    635636      case EBADF:
    636         printError("No valid socket descriptor");
     637        printError((char *)"No valid socket descriptor");
    637638        break;
    638639      case EISCONN:
    639         printError("The socket is already connected\n");
     640        printError((char *)"The socket is already connected\n");
    640641        break;
    641642      case ETIMEDOUT:
    642         printError("No connection. Timed out.\n");
     643        printError((char *)"No connection. Timed out.\n");
    643644        break;
    644645      case ECONNREFUSED:
    645         printError("Connection refused by  host.\n");
     646        printError((char *)"Connection refused by  host.\n");
    646647        break;
    647648      case EADDRNOTAVAIL:
    648         printError("Address not avaiable.\n");
     649        printError((char *)"Address not avaiable.\n");
    649650        break;
    650651
    651652      default:
    652         printError("General failure: Cannot connect to host\n");
     653        printError((char *)"General failure: Cannot connect to host\n");
    653654      }
    654655    close(s);
    … …  
    656657  }
    657658  if(verbose)
    658     printError("connected.\n");
     659    printError((char *)"connected.\n");
    659660  return 0;
    660661}

  • branches/v2.9_Lars/mediafolder/c/cddb/printhelper.cpp

    r2 r91  
    3030 */
    3131
    32 void extern printError(char* errorString)
     32void printError(char* errorString)
    3333{
    3434  fprintf(stderr,"%s",errorString);
    3535}
    3636
    37 void extern printErrorCR(char* errorString)
     37void printErrorCR(char* errorString)
    3838{
    3939  fprintf(stderr,"%s\n",errorString);
    … …  
    4141
    4242
    43 void extern printData(char* outString)
     43void printData(char* outString)
    4444{
    4545  int fileHandle;

  • branches/v2.9_Lars/mediafolder/c/cddb/res/makefile

    r53 r91  
    1313
    1414CPPFILES        =
    15 all:     pmcddb001.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll pmcddb088.dll
     15all:     pmcddb001.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll pmcddb088.dll pmcddb033.dll pmcddb034.dll
    1616
    1717
    … …  
    2929                gcc -Zdll -Zomf -I$(INC) pmcddb049.c pmcddb049.def
    3030                rc pmcddb049.res pmcddb049.dll
    31 #               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb04á.def
    3231
    3332pmcddb049.res:  pmcddb049.rc pmcddb049.dlg $(INC)\pmcddbres.h
    … …  
    3736                gcc -Zdll -Zomf -I$(INC) pmcddb031.c pmcddb031.def
    3837                rc pmcddb031.res pmcddb031.dll
    39 #               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb04á.def
    4038
    4139pmcddb031.res:  pmcddb031.rc pmcddb031.dlg $(INC)\pmcddbres.h
    … …  
    4543                gcc -Zdll -Zomf -I$(INC) pmcddb039.c pmcddb039.def
    4644                rc pmcddb039.res pmcddb039.dll
    47 #               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb04á.def
    4845
    4946pmcddb039.res:  pmcddb039.rc pmcddb039.dlg $(INC)\pmcddbres.h
    … …  
    5754                rc  -i $(INC) -r pmcddb088.rc
    5855
     56pmcddb033.dll:  pmcddb033.c pmcddb033.res
     57                gcc -Zdll -Zomf -I$(INC) pmcddb033.c pmcddb033.def
     58                rc pmcddb033.res pmcddb033.dll
     59
     60pmcddb033.res:  pmcddb033.rc pmcddb033.dlg $(INC)\pmcddbres.h
     61                rc  -i $(INC) -r pmcddb033.rc
     62
     63pmcddb034.dll:  pmcddb034.c pmcddb034.res
     64                gcc -Zdll -Zomf -I$(INC) pmcddb034.c pmcddb034.def
     65                rc pmcddb034.res pmcddb034.dll
     66
     67pmcddb034.res:  pmcddb034.rc pmcddb034.dlg $(INC)\pmcddbres.h
     68                rc  -i $(INC) -r pmcddb034.rc
     69
    5970clean:
    6071        -rm *.obj
    … …  
    6475cleaner:
    6576        -rm *.*~
    66 
    67        
    68 

  • branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb007.DEF

    r90 r91  
    1919; */
    2020
    21 LIBRARY PMDB001 INITGLOBAL
     21LIBRARY PMDB007 INITINSTANCE TERMINSTANCE
    2222DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB001.DLL)#@##1## 12.05.2002 18:17:00      ;-)  ::::1::@@Resource-DLL'
    23 PROTMODE
    24 CODE LOADONCALL DISCARDABLE
    25 DATA SINGLE SHARED DISCARDABLE
    26 EXPORTS 
    27         queryLanguage
     23DATA MULTIPLE NONSHARED
     24EXPORTS
     25      queryLanguage = _queryLanguage
    2826

  • branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb033.DEF

    r90 r91  
    2222;  */
    2323
    24 LIBRARY PMDB033 INITGLOBAL
     24LIBRARY PMDB033 INITINSTANCE TERMINSTANCE
    2525DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB033.DLL)#@##1## 12.05.2002 18:17:00      Mon ;-)  ::::1::@@DLL Ressource'
    26 PROTMODE
    27 CODE LOADONCALL DISCARDABLE
    28 DATA SINGLE SHARED DISCARDABLE
     26DATA MULTIPLE NONSHARED
    2927EXPORTS
    30         queryLanguage
     28      queryLanguage = _queryLanguage

  • branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb034.DEF

    r90 r91  
    1818; */
    1919
    20 LIBRARY PMDB034 INITGLOBAL
     20LIBRARY PMDB034 INITINSTANCE TERMINSTANCE
    2121DESCRIPTION '$@#ž Chris Wohlgemuth :0.1 (12.05.02) (PMDB034.DLL)#@##1## 12.05.2002 18:17:00      Mi ;-)  ::::1::@@DLL de recursos'
    22 PROTMODE
    23 CODE LOADONCALL DISCARDABLE
    24 DATA SINGLE SHARED DISCARDABLE
     22DATA MULTIPLE NONSHARED
    2523EXPORTS 
    26         queryLanguage
     24      queryLanguage = _queryLanguage
    2725

  • branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb034.c

    r90 r91  
    1717 * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
    1818 */
    19 /*
    20  * French translation....: Guillaume Gay <guillaume[dot]gay[arobase]gmail[dot]com>
    21  * Version...............: 2020-07-22
    22  */
    2319
    2420#include <os2.h>
    … …  
    2622PSZ queryLanguage()
    2723{
    28   return "Fran‡ais (033)";
     24  return "Espagnol (034)";
    2925}

  • branches/v2.9_Lars/mediafolder/c/helper/cddbhelper.cpp

    r57 r91  
    3838 */
    3939
    40 void extern printError(char* errorString)
     40void printError(char* errorString)
    4141{
    4242    char buffer[CCHMAXPATH] = {0};
    … …  
    5555}
    5656
    57 void extern printErrorCR(char* errorString)
     57void printErrorCR(char* errorString)
    5858{
    5959  fprintf(stderr,"%s\n",errorString);
    … …  
    6363
    6464
    65 void extern printData(char* outString)
     65void printData(char* outString)
    6666{
    6767  int fileHandle;
    6868  int rc;
    6969
    70   /* The name cddbDataFile is defined in the main pmcddb.cpp file. It is 
     70  /* The name cddbDataFile is defined in the main pmcddb.cpp file. It is
    7171     the discid (this is the native format of the data hold by a cddb server) */
    7272  fileHandle=open(cddbDataFile,O_APPEND|O_TEXT|O_WRONLY|O_CREAT,S_IWRITE);

  • branches/v2.9_Lars/mediafolder/include/mediafolderres.h

    r4 r91  
    121121#define IDGB_ABOUT                  605
    122122#define IDST_URL2                   606
     123#define IDST_PRODCOPY2        607
    123124
    124125#define IDSL_TEST                   305
    … …  
    127128
    128129#define IDPTR_ARROWWE              2    /* WE Cursor for slider controls */
    129 
    130 
    131 
    132 
    133 
    134 
    135 
    136 

  • branches/v2.9_Lars/mediafolder/prog_tutorial/hiddenfeatures.inc

    r4 r91  
    1212:p.
    1313Even if a new program isn't specified in the INI file the classes improve the default
    14 behaviour by not starting the player as part of the WPS process. So if the player crashes
    15 the WPS doesn't crash anymore .
     14behavior by not starting the player as part of the WPS process. So if the player crashes
     15the WPS doesn't crash anymore.
    1616
    1717
    … …  
    3030:p.
    3131Even if a new program isn't specified in the INI file the classes improve the default
    32 behaviour by not starting the editor as part of the WPS process. So if the editor crashes
     32behavior by not starting the editor as part of the WPS process. So if the editor crashes
    3333the WPS doesn't crash anymore.
    3434
    … …  
    4747:p.
    4848Even if a new program isn't specified in the INI file the classes improve the default
    49 behaviour by not starting the player as part of the WPS process. So if the player crashes
    50 the WPS doesn't crash anymore .
     49behavior by not starting the player as part of the WPS process. So if the player crashes
     50the WPS doesn't crash anymore.
    5151
    5252
    … …  
    6464:p.
    6565Even if a new program isn't specified in the INI file the classes improve the default
    66 behaviour by not starting the player as part of the WPS process. So if the player crashes
    67 the WPS doesn't crash anymore .
     66behavior by not starting the player as part of the WPS process. So if the player crashes
     67the WPS doesn't crash anymore.
    6868
    6969
    … …  
    8181:p.
    8282Even if a new program isn't specified in the INI file the classes improve the default
    83 behaviour by not starting the player as part of the WPS process. So if the default player crashes
     83behavior by not starting the player as part of the WPS process. So if the default player crashes
    8484the WPS doesn't crash, too.
    8585
    … …  
    108108:ent.
    109109:p.
    110 Default behaviour is to create a new MEdia folder and fill it with the tracks specified in the
    111 M3U file. Using this setting it's possible to use another MP3 player.
     110Default behavior is to create a new Media folder and fill it with the tracks specified in the
     111M3U file. Using this setting it's possible to use another M3U player.
    112112
    113113
    … …  
    126126:p.
    127127Even if a new program isn't specified in the INI file the classes improve the default
    128 behaviour by not starting the editor as part of the WPS process. So if the editor crashes
    129 the WPS doesn't crash anymore. 
     128behavior by not starting the editor as part of the WPS process. So if the editor crashes
     129the WPS doesn't crash anymore.
    130130
    131131

  • branches/v2.9_Lars/mediafolder/prog_tutorial/mediafldrprog.ipf

    r4 r91  
    33:docprof.
    44
    5 :title.Programming tutorial for Multimedia classes 
     5:title.Programming tutorial for Multimedia classes
    66
    77:h1 res=100.Introduction
    … …  
    1313For use of the REXX interface
    1414:p.
    15 :link reftype=launch
    16 object='netscape.exe'
    17 data='http://www.os2world.com/cdwriting'.
    18 WPS-Wizard V0.2.0:elink. (http&colon.//www.os2world.com/cdwriting)
    19 :p.
    20 or above must be installed.
     15WPS-Wizard V0.2.0 (http&colon.//www.os2world.com/cdwriting)
     16:p.
     17or above must be installed.
    2118
    2219:h1 res=200
    … …  
    2926:li.:link reftype=hd res=211.MEDIAFLDRPLAY:elink.   Start playing
    3027:li.:link reftype=hd res=215.MEDIAFLDRPLAYFIRST:elink.   Start first track
    31 :li.:link reftype=hd res=212.MEDIAFLDRPREV:elink.   Skip to previus track
    32 :li.:link reftype=hd res=216.MEDIAFLDRREPEAT:elink. Set repeat.
     28:li.:link reftype=hd res=212.MEDIAFLDRPREV:elink.   Skip to previous track
     29:li.:link reftype=hd res=216.MEDIAFLDRREPEAT:elink. Set repeat
    3330:li.:link reftype=hd res=213.MEDIAFLDRSTOP:elink.   Stop playing
    3431:li.:link reftype=hd res=214.MEDIAFLDRVOLUME:elink. Set volume
    … …  
    146143:p.
    147144Set the track name of the audio file. This information is saved in the EA of the file. For
    148 MP3 files this information id also saved in the ID3 tag.
     145MP3 files this information is also saved in the ID3 tag.
    149146:xmp.
    150147/* REXX - This command adds the track name to the audio file */
    … …  
    225222Reread the audio information from the file and update internal object data.
    226223:xmp.
    227 /* REXX - This command adds the genre of the audio file */
     224/* REXX - This command rereads the information of the audio file */
    228225
    229226rc=SysSetObjectData('x&colon.\path_to_folder\audio_file.ext','MMREFRESH=1')
    … …  
    234231group=2
    235232.MMAUDIOCOPYTAGTO
    236 :p.
    237 Reread the audio information from the file and update internal object data.
    238 :xmp.
    239 /* REXX - This command adds the genre of the audio file */
     233
     234Read the audio information from the file tag and copies it to another file.
     235
     236:xmp.
     237/* REXX - This command copies the file tag information to another audio file */
    240238
    241239rc=SysSetObjectData('x&colon.\path_to_folder\audio_file.ext','MMAUDIOCOPYTAGTO=x&colon.\path_to_folder\another_file.ext')
    … …  
    311309param2         /* Second method parameter */
    312310:p.
    313 rc=MFldrCallFunc(methodName, Object, 
     311rc=MFldrCallFunc(methodName, Object,
    314312                 param1, param2, ...);
    315313:exmp.
    … …  
    421419param2         /* Second method parameter */
    422420:p.
    423 rc=MMCallFunc(methodName, Object, 
     421rc=MMCallFunc(methodName, Object,
    424422                 param1, param2, ...);
    425423:exmp.
    … …  
    517515:li.:link reftype=hd res=420.Disable audio file checking:elink.
    518516:li.:link reftype=hd res=421.Disable ID3 tag reading:elink.
    519 :li.:link reftype=hd res=422.Set time for message box display:elink.
     517:li.:link reftype=hd res=422.Replace M3U editor:elink.
     518:li.:link reftype=hd res=423.Replace M3U player:elink.
    520519:eul.
    521520

  • branches/v2.9_Lars/mediafolder/prog_tutorial/newmethods.inc

    r2 r91  
    121121.cwPauseAudioFile - Remarks
    122122:p.
    123 The frame handle of the media folder is given to the skript as a parameter
     123The frame handle of the media folder is given to the script as a parameter
    124124when started.
    125125
    … …  
    177177.cwPlayAudioFile - Remarks
    178178:p.
    179 The frame handle of the media folder is given to the skript as a parameter
     179The frame handle of the media folder is given to the script as a parameter
    180180when started. The flag parameter may have one of the following values.
    181181
    … …  
    292292.cwSetStatusLineText - Remarks
    293293:p.
    294 If the text parameter is 0 the folder shows it's standard
     294If the text parameter is 0 the folder shows its standard
    295295status line text.
    296296
    … …  
    348348.cwStopAudioFile - Remarks
    349349:p.
    350 The frame handle of the media folder is given to the skript as a parameter
     350The frame handle of the media folder is given to the script as a parameter
    351351when started.
    352352
    … …  
    407407.cwmmQueryTrackInfo - Remarks
    408408:p.
    409 The object must be an instance of :hp2.CWAudio:ehp2. or of one of it's
     409The object must be an instance of :hp2.CWAudio:ehp2. or of one of its
    410410subclasses (:hp2.CWMP3:ehp2., :hp2.MMWAV:ehp2....). This method was introduced
    411411by :hp2.CWAudio:ehp2.. Since V0.2.5 of the classes the class names are :hp2.MMAudio:ehp2.
    … …  
    446446:li.IDINFO_BITRATE           11
    447447.br
    448 Bitrate in Hz (numeric value). This flag is only valid for instances of class MMMP3 and
    449 MMOGG. For other classes the return value is undefined. New with V0.2.7.
     448Bitrate in KB per second (numeric value). This flag is only valid for instances
     449of class MMMP3 and MMOGG. For other classes the return value is undefined. New
     450with V0.2.7.
    450451:eul.
    451452
    … …  
    524525:pd.Image format.
    525526:eparml.
    526 :pt.:hp2.info:ehp2. (numeric)
    527 :pd.The queried information as a string.
    528527:eparml.
    529528
    530 
    531 
    532 
    533 

  • branches/v2.9_Lars/mediafolder/res/de/about_de.dlg

    r74 r91  
    1414        CTEXT           MFLDR_AUTHOR, IDST_PRODCOPY, 10, 87,
    1515                        186, 12, DT_VCENTER | NOT WS_GROUP
     16        CTEXT           "Copyright (c) netlabs.org 2020",
     17                        IDST_PRODCOPY2, 10, 64, 186, 12, DT_VCENTER | NOT WS_GROUP
    1618        CTEXT           "Graphiken von Klaus Staedtler-Przyborski",
    1719                        IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK |
    1820                        NOT WS_GROUP
     21        CTEXT           "https://trac.netlabs.org/cwmmclasses", IDST_URL1,
     22                        10, 30, 186, 18, DT_WORDBREAK | NOT WS_GROUP
     23                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    1924        DEFPUSHBUTTON   "~Ok", DID_OK, 83, 3, 40, 14
    2025    END

  • branches/v2.9_Lars/mediafolder/res/en/about_en.dlg

    r90 r91  
    1 #define VER_STRING "Media-Ordner V" \
     1#define VER_STRING "Media Folder v" \
    22MFLDR_VERSION \
    33BUILD_STRING
    … …  
    1111        CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187,
    1212                        12, DT_VCENTER | NOT WS_GROUP
    13         CTEXT           MFLDR_AUTHOR, IDST_PRODCOPY, 10, 87,
    14                         186, 12, DT_VCENTER | NOT WS_GROUP
    15         CTEXT           "Graphics by Klaus Staedtler-Przyborski",
    16                         IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK |
     13        CTEXT           MFLDR_AUTHOR,
     14                        IDST_PRODCOPY, 10, 87, 186, 12, DT_VCENTER | NOT WS_GROUP
     15        CTEXT           "Copyright (c) netlabs.org 2020",
     16                        IDST_PRODCOPY2, 10, 64, 186, 12, DT_VCENTER | NOT WS_GROUP
     17        CTEXT           "Graphics by Klaus Staedtler-Przyborski",
     18                        IDST_PRODGRAPHICS, 10, 46, 186, 17, DT_WORDBREAK |
    1719                        NOT WS_GROUP
     20        CTEXT           "https://trac.netlabs.org/cwmmclasses", IDST_URL1,
     21                        10, 30, 186, 18, DT_WORDBREAK | NOT WS_GROUP
     22                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    1823        DEFPUSHBUTTON   "~Ok", DID_OK, 83, 3, 40, 14
    1924    END
    2025END
    21 
    22 

  • branches/v2.9_Lars/mediafolder/res/en/mediafolder_en.dlg

    r2 r91  
    4141        GROUPBOX        "Toolbar", IDGB_TOOLBAR, 9, 24, 181, 127, NOT
    4242                        WS_GROUP
    43         AUTOCHECKBOX    "~Enable fly over help", IDCB_ENABLETBFLYOVER, 16,
     43        AUTOCHECKBOX    "~Enable fly-over help", IDCB_ENABLETBFLYOVER, 16,
    4444                        129, 152, 10
    4545        SPINBUTTON      IDSB_TBFLYOVERDELAY, 97, 115, 40, 12,
    4646                        SPBS_NUMERICONLY | SPBS_MASTER | SPBS_FASTSPIN |
    4747                        WS_GROUP
    48         GROUPBOX        "Fly over colours and font", IDGB_COLORANDFONT, 15,
     48        GROUPBOX        "Fly-over colors and font", IDGB_COLORANDFONT, 15,
    4949                        30, 168, 76, NOT WS_GROUP
    50         LTEXT           "Klick button for colour- or fontpalette.           "
     50        LTEXT           "Click button for color or font palette.           "
    5151                        "             
    52 Press <CTRL> during drag 'n drop to change the text colour.",
     52Hold <Ctrl> during drag'n'drop to change the text color.",
    5353                        IDST_TEXTDEMOFIELD, 23, 35, 95, 57, DT_WORDBREAK
    5454                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x000000FFL
    5555                        PRESPARAMS PP_BACKGROUNDCOLOR, 0x00FFFFFFL
    56         PUSHBUTTON      "~Colour...", IDPB_COLORPALETTE, 129, 72, 45, 14
     56        PUSHBUTTON      "~Color...", IDPB_COLORPALETTE, 129, 72, 45, 14
    5757        PUSHBUTTON      "~Font...", IDPB_FONTPALETTE, 129, 49, 45, 14
    5858        PUSHBUTTON      "~Undo", IDPB_COLORUNDO, 16, 7, 52, 14
    … …  
    100100    END
    101101END
    102 
    103 

  • branches/v2.9_Lars/mediafolder/res/en/mediafolder_en.rc

    r4 r91  
    1515BEGIN
    1616   MENUITEM  "" , ID_MENUSEPARATOR, MIS_SEPARATOR
    17    MENUITEM "~Product Information",ID_ABOUTITEM   
     17   MENUITEM "~Product Information",ID_ABOUTITEM
    1818END
    1919#else
    … …  
    2121BEGIN
    2222   MENUITEM  "" , ID_MENUSEPARATOR, MIS_SEPARATOR
    23    MENUITEM "~Media Folder Information",ID_ABOUTITEM   
     23   MENUITEM "~Media Folder Information",ID_ABOUTITEM
    2424END
    2525#endif
    … …  
    4545BEGIN
    4646        MENUITEM "~Save"   ,            ID_MENUITEMSAVE
    47         MENUITEM ""           ,                 ID_MENUSEPARATOR, MIS_SEPARATOR               
     47        MENUITEM ""           ,                 ID_MENUSEPARATOR, MIS_SEPARATOR
    4848        MENUITEM "~Exit" ,                      ID_MENUITEMEXIT
    4949END
    … …  
    5353BEGIN
    5454IDSTR_CLOSETITLE "Confirmation"
    55 IDSTR_CLOSETEXT  "There's currently a song playing. Do you really want to stop playing and close the player?"
     55IDSTR_CLOSETEXT  "There's currently an audio file playing. Do you really want to stop playing and close the player?"
    5656IDSTRSETTING_TOOLBAR "Toolbar"
    57 IDSTRS_NOFONTPALETTE          "Can't open the font palette. It may have lost it's ID. Check your INI files."
    58 IDSTRS_NOCOLORPALETTE         "Can't open the color palette. It may have lost it's ID. Check your INI files."
     57IDSTRS_NOFONTPALETTE          "Can't open the font palette. It may have lost its ID. Check your INI files."
     58IDSTRS_NOCOLORPALETTE         "Can't open the color palette. It may have lost its ID. Check your INI files."
    5959IDSTRS_MEDIAFLDRSETTINGS   "Media-Folder setup"
    6060#ifdef ECS

  • branches/v2.9_Lars/mediafolder/res/es/about_es.dlg

    r28 r91  
    99    BEGIN
    1010        GROUPBOX        "", IDGB_ABOUT, 3, 21, 200, 108
    11 ;        CTEXT           "Carpeta de medios v0.2.9", IDST_PRODNAME, 36, 107, 135,
    1211        CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187,
    1312                        12, DT_VCENTER | NOT WS_GROUP
    14         CTEXT           "Copyright ž Chris Wohlgemuth 2002-2003",
     13        CTEXT           MFLDR_AUTHOR,
    1514                        IDST_PRODCOPY, 10, 87, 186, 12, DT_VCENTER | NOT WS_GROUP
    1615        CTEXT           "Copyright ž netlabs.org 2020",
    … …  
    2221                        10, 30, 186, 18, DT_WORDBREAK | NOT WS_GROUP
    2322                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    24 ;        CTEXT           "http://www.os2world.com/cdwriting", IDST_URL2, 10,
    25 ;                        30, 186, 16, DT_WORDBREAK
    26 ;                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    2723        DEFPUSHBUTTON   "~Bien", DID_OK, 83, 3, 40, 14
    2824    END

  • branches/v2.9_Lars/mediafolder/res/es/create_res_es_def.CMD

    r34 r91  
    5757def=def||'0d'x||'0a'x
    5858
    59 def=def||"LIBRARY MFLDR_EN INITGLOBAL"||'0d'x||'0a'x
     59def=def||"LIBRARY MFLDR_ES INITINSTANCE TERMINSTANCE"||'0d'x||'0a'x
    6060def=def||"DESCRIPTION '$@#ž C. Wohlgemuth "
    6161def=def||WORD(DATE(),3)||":"||LEFT(theVersion,3)||"        #@##1## "||DATE("E")||" "||TIME("N")||"        Mi ;-)  ::::"||WORD(TRANSLATE(theVersion," ", "."),3)||"::@@DLL de recursos para Carpeta de medios v"||theVersion||" -espa€ol-'"||'0d'x||'0a'x
    62 def=def||"PROTMODE"||'0d'x||'0a'x
    63 def=def||"CODE LOADONCALL DISCARDABLE"||'0d'x||'0a'x
    64 def=def||"DATA SINGLE SHARED DISCARDABLE"||'0d'x||'0a'x
     62def=def||"DATA MULTIPLE NONSHARED"||'0d'x||'0a'x
    6563def=def||"EXPORTS  "||'0d'x||'0a'x
    6664def=def||"        queryLanguage"||'0d'x||'0a'x

  • branches/v2.9_Lars/mediafolder/res/es/mediafolder_es.c

    r90 r91  
    1717 * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
    1818 */
    19 /*
    20  * French translation....: Guillaume Gay <guillaume[dot]gay[arobase]gmail[dot]com>
    21  * Version...............: 2020-07-23
    22  */
    2319#include <os2.h>
    2420
    2521PSZ queryLanguage()
    2622{
    27   return "Fran‡ais";
     23  return "Espagnol";
    2824}

  • branches/v2.9_Lars/mediafolder/res/fr/about_fr.dlg

    r26 r91  
    99    BEGIN
    1010        GROUPBOX        "", IDGB_ABOUT, 3, 21, 200, 108
    11 ;        CTEXT           "Media-Folder V0.2.9", IDST_PRODNAME, 36, 107, 135,
    1211        CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187,
    1312                        12, DT_VCENTER | NOT WS_GROUP
    14         CTEXT           "Copyright (c) Chris Wohlgemuth 2002-2003",
     13        CTEXT           MFLDR_AUTHOR,
    1514                        IDST_PRODCOPY, 10, 87, 186, 12, DT_VCENTER | NOT WS_GROUP
    1615        CTEXT           "Copyright (c) netlabs.org 2020",
    … …  
    2221                        10, 30, 186, 18, DT_WORDBREAK | NOT WS_GROUP
    2322                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    24 ;        CTEXT           "http://www.os2world.com/cdwriting", IDST_URL2, 10,
    25 ;                        30, 186, 16, DT_WORDBREAK
    26 ;                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    2723        DEFPUSHBUTTON   "~OK", DID_OK, 83, 3, 40, 14
    2824    END

  • branches/v2.9_Lars/mediafolder/res/fr/create_res_fr_def.CMD

    r26 r91  
    8989def=def||'0d'x||'0a'x
    9090
    91 def=def||"LIBRARY MFLDR_FR INITGLOBAL"||'0d'x||'0a'x
     91def=def||"LIBRARY MFLDR_FR INITINSTANCE TERMINSTANCE"||'0d'x||'0a'x
    9292def=def||"DESCRIPTION '$@#(C) C. Wohlgemuth "
    9393def=def||WORD(DATE(),3)||":"||LEFT(theVersion,3)||"        #@##1## "||DATE("E")||" "||TIME("N")||"        My ;-)  ::::"||WORD(TRANSLATE(theVersion," ", "."),3)||"::@@Media-Folder V"||theVersion||" resource DLL -english-'"||'0d'x||'0a'x
    94 def=def||"PROTMODE"||'0d'x||'0a'x
    95 def=def||"CODE LOADONCALL DISCARDABLE"||'0d'x||'0a'x
    96 def=def||"DATA SINGLE SHARED DISCARDABLE"||'0d'x||'0a'x
     94def=def||"DATA MULTIPLE NONSHARED"||'0d'x||'0a'x
    9795def=def||"EXPORTS  "||'0d'x||'0a'x
    9896def=def||"        queryLanguage"||'0d'x||'0a'x

  • branches/v2.9_Lars/mediafolder/res/it/about_it.dlg

    r90 r91  
    1313        CTEXT           MFLDR_AUTHOR, IDST_PRODCOPY, 10, 87,
    1414                        186, 12, DT_VCENTER | NOT WS_GROUP
     15        CTEXT           "Copyright (c) netlabs.org 2020",
     16                        IDST_PRODCOPY2, 10, 64, 186, 12, DT_VCENTER | NOT WS_GROUP                       
    1517        CTEXT           "Graphics by Klaus Staedtler-Przyborski",
    1618                        IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK |
    1719                        NOT WS_GROUP
     20        CTEXT           "https://trac.netlabs.org/cwmmclasses", IDST_URL1,
     21                        10, 30, 186, 18, DT_WORDBREAK | NOT WS_GROUP
     22                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"                       
    1823        DEFPUSHBUTTON   "~Ok", DID_OK, 83, 3, 40, 14
    1924    END

  • branches/v2.9_Lars/mediafolder/res/it/mediafolder_it.rc

    r4 r91  
    7878
    7979#ifdef ECS
    80 rcinclude "about_ecs_en.dlg"
     80rcinclude "about_ecs_it.dlg"
    8181#else
    82 rcinclude "about_en.dlg"
     82rcinclude "about_it.dlg"
    8383#endif
    8484

  • branches/v2.9_Lars/mediafolder/res/makefile

    r74 r91  
    66CC           = icc
    77CPPFLAGS     = /Ge- /Gm+ /G4 /Gl- /Ga- /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
    8 INC     =       ..\include
     8INC     =       ..\\include
    99INC2    =       ../include
    1010DEFS         =

  • branches/v2.9_Lars/mediafolder/res/nl/about_nl.dlg

    r90 r91  
    1313        CTEXT           MFLDR_AUTHOR, IDST_PRODCOPY, 10, 87,
    1414                        186, 12, DT_VCENTER | NOT WS_GROUP
     15        CTEXT           "Copyright (c) netlabs.org 2020",
     16                        IDST_PRODCOPY2, 10, 64, 186, 12, DT_VCENTER | NOT WS_GROUP                       
    1517        CTEXT           "Graphics door Klaus Staedtler-Przyborski",
    1618                        IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK |
    1719                        NOT WS_GROUP
     20        CTEXT           "https://trac.netlabs.org/cwmmclasses", IDST_URL1,
     21                        10, 30, 186, 18, DT_WORDBREAK | NOT WS_GROUP
     22                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    1823        DEFPUSHBUTTON   "~Ok", DID_OK, 83, 3, 40, 14
    1924    END

  • branches/v2.9_Lars/mediafolder/res/ru/about_ru.dlg

    r37 r91  
    99    BEGIN
    1010        GROUPBOX        "", IDGB_ABOUT, 3, 21, 200, 108
    11 ;        CTEXT           "Media-Folder V0.2.9", IDST_PRODNAME, 36, 107, 135,
    1211        CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187,
    1312                        12, DT_VCENTER | NOT WS_GROUP
    14         CTEXT           "Copyright (c) Chris Wohlgemuth 2002-2003",
     13        CTEXT           MFLDR_AUTHOR,
    1514                        IDST_PRODCOPY, 10, 87, 186, 12, DT_VCENTER | NOT WS_GROUP
    1615        CTEXT           "Copyright (c) netlabs.org 2020",
    … …  
    2221                        10, 30, 186, 18, DT_WORDBREAK | NOT WS_GROUP
    2322                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    24 ;        CTEXT           "http://www.os2world.com/cdwriting", IDST_URL2, 10,
    25 ;                        30, 186, 16, DT_WORDBREAK
    26 ;                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    2723        DEFPUSHBUTTON   "~Žª", DID_OK, 83, 3, 40, 14
    2824    END

  • branches/v2.9_Lars/mediafolder/res/ru/create_res_ru_def.CMD

    r37 r91  
    116116def=def||'0d'x||'0a'x
    117117
    118 def=def||"LIBRARY MFLDR_EN INITGLOBAL"||'0d'x||'0a'x
     118def=def||"LIBRARY MFLDR_RU INITINSTANCE TERMINSTANCE"||'0d'x||'0a'x
    119119def=def||"DESCRIPTION '$@#(C) C. Wohlgemuth "
    120120def=def||WORD(DATE(),3)||":"||LEFT(theVersion,3)||"        #@##1## "||DATE("E")||" "||TIME("N")||"      ;-)  ::::"||WORD(TRANSLATE(theVersion," ", "."),3)||"::@@¥áãàá­ ï DLL Media-Folder V"||theVersion||"  -àãá᪚©-'"||'0d'x||'0a'x
    121 def=def||"PROTMODE"||'0d'x||'0a'x
    122 def=def||"CODE LOADONCALL DISCARDABLE"||'0d'x||'0a'x
    123 def=def||"DATA SINGLE SHARED DISCARDABLE"||'0d'x||'0a'x
     121def=def||"DATA MULTIPLE NONSHARED"||'0d'x||'0a'x
    124122def=def||"EXPORTS  "||'0d'x||'0a'x
    125123def=def||"        queryLanguage"||'0d'x||'0a'x

  • branches/v2.9_Lars/mediafolder/res/ru/mediafolder_ru.c

    r90 r91  
    1717 * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
    1818 */
    19 /*
    20  * French translation....: Guillaume Gay <guillaume[dot]gay[arobase]gmail[dot]com>
    21  * Version...............: 2020-07-23
    22  */
    2319#include <os2.h>
    2420
    2521PSZ queryLanguage()
    2622{
    27   return "Fran‡ais";
     23  return "Russian";
    2824}

  • branches/v2.9_Lars/mediafolder/res/tw/mediafolder_tw.dlg

    r90 r91  
    114114        CTEXT           MFLDR_AUTHOR, IDST_PRODCOPY, 10, 87,
    115115                        186, 12, DT_VCENTER | NOT WS_GROUP
     116        CTEXT           "Copyright (c) netlabs.org 2020",
     117                        IDST_PRODCOPY2, 10, 64, 186, 12, DT_VCENTER | NOT WS_GROUP
    116118        CTEXT           "Graphics by Klaus Staedtler-Przyborski",
    117119                        IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK |
    118120                        NOT WS_GROUP
     121        CTEXT           "https://trac.netlabs.org/cwmmclasses", IDST_URL1,
     122                        10, 30, 186, 18, DT_WORDBREAK | NOT WS_GROUP
     123                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    119124        DEFPUSHBUTTON   "~Ok", DID_OK, 83, 3, 40, 14
    120125    END
Note: See TracChangeset for help on using the changeset viewer.