Changeset 103


Ignore:
Timestamp:
Oct 2, 2023, 8:59:09 PM (2 years ago)
Author:
gyoung
Message:

These 3 files had conflicts when merged with Lars 2.9 branch. I took a mixture of the 2 versions. so these should be merged back into the branch

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/JPGPROC/source/makefile

    r94 r103  
    11#/*
    2 # * Copyright (c) Chris Wohlgemuth 2002 
     2# * Copyright (c) Chris Wohlgemuth 2002
    33# * All rights reserved.
    44# *
    … …  
    7373# Target Descriptions
    7474#################################
    75 all:    JPEGIO.DLL 
    76 #iotest.exe 
     75all:    JPEGIO.DLL
     76#iotest.exe
    7777
    7878

  • trunk/classes/help/en/cwmm.ipf

    r93 r103  
    11:userdoc.
    2 
    32:docprof.
    4 
    5 :title.Help
    6 
     3:title.CWMM Help
     4
     5.* ----------------------------------------------------------------------------
    76:h1 res=010.MP3 audio file
    8 :p.
    9 This file is an MP3 audio file. It may be played using MMOS/2
    10 after installing of MMIOMP3 a free multimedia IO procedure.
    11 MP3 files contain compressed audio data.
    12 The compression is not lossless.
    13 :p.
    14 Get the IO procedure from
    15 :p.
    16 
    17 https&colon.//hobbes.nmsu.edu/download/pub/os2/apps/mmedia/codec/MMeCS-MP3_1-2.zip
    18 
    19 :h1 res=011.ID3 Tag
    20 :p.
    21 Use this page for the editing of ID3 tags.
    22 If the entry fields
    23 are empty this file does not have any tag yet.
    24 The new information is only saved after pressing the :hp2.Save:ehp2.
    25 button.
    26 
    27 :p.
    28 The following information may be specified:
    29 :ul.
    30 :li.:hp2.Name:ehp2.
    31 .br
    32 The name of the track. The length is restricted to 30 characters.
    33 
    34 :li.:hp2.Artist:ehp2.
    35 .br
    36 The name of the Artist. The length is restricted to 30 characters.
    37 
    38 :li.:hp2.Album:ehp2.
    39 .br
    40 The album containing this track. The length is restricted to 30 characters.
    41 
    42 :li.:hp2.Comment:ehp2.
    43 .br
    44 An arbitrary comment. The length is restricted to 30 characters.
    45 
    46 :li.:hp2.Year:ehp2.
    47 .br
    48 The year the album was published.
    49 
    50 :li.:hp2.Genre:ehp2.
    51 .br
    52 The Genre of this track.
    53 
    54 :eul.
    55 
    56 :h1 res=013.ID3 Tag
    57 :p.
    58 This page displays the ID3 tags of the MP3 file. ID3 is a standard to add information
    59 to an MP3 file like the title of the track or the tracks artist.
    60 :p.
    61 If the entry fields are empty this file does not have any tag yet.
    62 
    63 :p.
    64 :ul.
    65 :li.:hp2.Name:ehp2.
    66 .br
    67 The name of the track. The length is restricted to 30 characters.
    68 
    69 :li.:hp2.Artist:ehp2.
    70 .br
    71 The name of the Artist. The length is restricted to 30 characters.
    72 
    73 :li.:hp2.Album:ehp2.
    74 .br
    75 The album containing this track. The length is restricted to 30 characters.
    76 
    77 :li.:hp2.Comment:ehp2.
    78 .br
    79 An arbitrary comment. The length is restricted to 30 characters.
    80 
    81 :li.:hp2.Year:ehp2.
    82 .br
    83 The year the album was published.
    84 
    85 :li.:hp2.Genre:ehp2.
    86 .br
    87 The Genre of this track.
    88 
    89 :eul.
    90 
     7:p.This file is an MP3 audio file. It may be played using MMOS/2 when a suitable
     8MP3 MMIOProc has been installed.
     9
     10:p.The MP3 format uses lossy compression to reduce the file size of the source
     11material. The amount of loss may or may not be acceptable. Usually, the amount
     12may be controlled by the encoding tool. Once encoded, however, it is not
     13possible to restore the bits which have been discarded. The source file must be
     14re-encoded again with a lower degree of loss.
     15
     16:p.An MP3 MMIOProc package is included in the MMAudio Pak 2, available from&colon.
     17
     18:p.http&colon.//r6.ca/MMAudioPak/
     19
     20.* ----------------------------------------------------------------------------
     21:h1 res=011.ID3 tag
     22:p.Use this page to edit selected ID3 tag fields.
     23
     24:p.An ID3 tag is metadata associated with a particular track, and is stored in
     25the MP3 file. ID3 is a :hp1.de facto:ehp1. standard, generally recognized by
     26most MP3 players.
     27
     28:p.If all entry fields are empty, the file does not have an ID3 tag. If some
     29fields are empty, this data has not been added to the tag.
     30
     31:p.The new information is only saved after pressing the :hp2.Save:ehp2. button.
     32
     33:p.The following information may be specified:
     34
     35:hp2.
     36:table rules=both frame=box cols='10 8 40'.
     37:row.
     38:c.Field
     39:c.Length
     40:c.Description
     41:row.
     42:c.Name
     43:c.30
     44:c.The name of the track.
     45:row.
     46:c.Artist
     47:c.30
     48:c.The name of the artist.
     49:row.
     50:c.Album
     51:c.30
     52:c.The album containing the track.
     53:row.
     54:c.Comment
     55:c.30
     56:c.An arbitrary comment about the track.
     57:row.
     58:c.Year
     59:c.4
     60:c.The 4-digit year in which the album was published.
     61:row.
     62:c.Genre
     63:c.30
     64:c.The genre of this track; select from dropdown.
     65:etable.
     66:ehp2.
     67
     68.* ----------------------------------------------------------------------------
     69:h1 res=013.ID3 tag
     70:p.This page displays selected fields of the ID3 tag attached to the MP3 file.
     71
     72:p.An ID3 tag is metadata associated with a particular track, and is stored in
     73the MP3 file. ID3 is a :hp1.de facto:ehp1. standard, generally recognized by
     74most MP3 players.
     75
     76:p.If all entry fields are empty, the file does not have an ID3 tag. If some
     77fields are empty, this data has not been added to the tag.
     78
     79:p.The new information is only saved after pressing the :hp2.Save:ehp2. button.
     80
     81:p.The following information may be specified:
     82
     83:hp2.
     84:table rules=both frame=box cols='10 8 40'.
     85:row.
     86:c.Field
     87:c.Length
     88:c.Description
     89:row.
     90:c.Name
     91:c.30
     92:c.The name of the track.
     93:row.
     94:c.Artist
     95:c.30
     96:c.The name of the artist.
     97:row.
     98:c.Album
     99:c.30
     100:c.The album containing the track.
     101:row.
     102:c.Comment
     103:c.30
     104:c.An arbitrary comment about the track.
     105:row.
     106:c.Year
     107:c.4
     108:c.The 4-digit year in which the album was published.
     109:row.
     110:c.Genre
     111:c.30
     112:c.The genre of this track; select from dropdown.
     113:etable.
     114:ehp2.
     115
     116.* ----------------------------------------------------------------------------
    91117:h1 res=012.Track meta data
    92 :p.
    93 Use this page for the editing of track information. The contents of the fields will be saved
    94 in the extended attributes of the file.
    95 The new information will be only saved after pressing the :hp2.Save:ehp2.
    96 button.
     118:p.Use this page to edit track information. Unlike an ID3 tag, the contents of
     119these fields will be saved in the extended attributes of the file upon pressing
     120the :hp2.Save:ehp2. button.
     121
    97122:nt.
    98 Extended attributes are only supported with OS/2 and they're not stored on CD. So
    99 if you copy the files to CD or another operating system they will be lost.
     123Extended attributes are only supported by OS/2 and other operating systems which
     124utilize these data structures in their filesystems (HPFS, JFS, XFS, ZFS, and to
     125a limited extent, ext4). Further, this information is not written to CD or DVD.
     126As a result, this data won't be saved or transferred along with its associated
     127files to any system which does not recognize extended attributes, resulting in
     128such copies lacking this data, even if it is present and intact in the source.
     129Use this feature with care.
    100130:ent.
    101 :p.
    102 The following information may be specified. The length of each field is restricted to 256 characters.
    103 :ul.
    104 :li.:hp2.Name&colon.:ehp2.
    105 :p.The name of the track.
    106 
    107 :li.:hp2.Artist&colon.:ehp2.
    108 :p.The name of the Artist.
    109 
    110 :li.:hp2.Album&colon.:ehp2.
    111 :p.The album containing this track.
    112 
    113 :li.:hp2.Comment&colon.:ehp2.
    114 :p.An arbitrary comment.
    115 
    116 :li.:hp2.Year&colon.:ehp2.
    117 :p.The year the album was published.
    118 
    119 :li.:hp2.Genre&colon.:ehp2.
    120 :p.The Genre of this track.
    121 
    122 :eul.
    123 
    124 :h1 res=020.Help for Ogg audio file
    125 :p.
    126 This file is an Ogg audio file. It may be played using MMOS/2
    127 after installing of MMIOVORB a free multimedia IO procedure.
    128 Ogg files contain comressed audio data similar to MP3 files.
    129 The compression is not lossless.
    130 :p.
    131 Get the IO procedure from
    132 :p.
    133 :link reftype=launch
    134 object='netscape.exe'
    135 data='http://www.math.berkeley.edu/~roconnor/'.
    136 http&colon.//www.math.berkeley.edu/~roconnor/:elink.
    137 
    138 
    139 :h1 res=030.Help for CD track
    140 :p.
    141 This object is a CD audio track. Track names and other info is
    142 queried from a FreeDB server if an internet connection is available.
    143 You have to specify your email address to use FreeDB. Use the configuration
    144 object to do so.
    145 :p.
    146 The user information is stored in the cddb.ini file in the installation directory.
    147 
    148 
    149 :h1 res=040.Help for M3U playlist
    150 :p.
    151 This object is a M3U playlist. An M3U playlist is a text file which contains
    152 paths to the tracks to be played. These playlists are used e.g. by portable
    153 MP3 players. An editor is available to modify M3U files using the mouse (drag and drop).
    154 
    155 :h1 res=050.Help for Audio stream
    156 :p.
    157 This object plays a stream from a streaming server on the internet.
    158 The URL for the server can be specified using the properties notebook.
     131
     132:p.The following information may be specified. The length of each field is
     133limited to 256 characters
     134
     135:hp2.
     136:table rules=both frame=box cols='10 40'.
     137:row.
     138:c.Field
     139:c.Description
     140:row.
     141:c.Name
     142:c.The name of the track.
     143:row.
     144:c.Artist
     145:c.The name of the artist.
     146:row.
     147:c.Album
     148:c.The album containing the track.
     149:row.
     150:c.Comment
     151:c.An arbitrary comment about the track.
     152:row.
     153:c.Year
     154:c.The 4-digit year in which the album was published.
     155:row.
     156:c.Genre
     157:c.The genre of this track; select from dropdown.
     158:etable.
     159:ehp2.
     160
     161.* ----------------------------------------------------------------------------
     162:h1 res=014.Audio details
     163:p.This page displays various technical details about the selected audio track.
     164
     165:p.The following read-only information is provided&colon.
     166
     167:hp2.
     168:table rules=both frame=box cols='20 40'.
     169:row.
     170:c.Detail
     171:c.Description
     172:row.
     173:c.Play time
     174:c.Recording length in mm&colon.ss.
     175:row.
     176:c.Sample rate
     177:c.For digital audio, this refers to the number of samples taken per second.
     178Generally, the higher the sample rate (sample frequency), the higher the quality
     179of the resulting audio stream.
     180:row.
     181:c.Bits per sample
     182:c.Bit depth of each sample. The greater the bit depth, the higher the quality of
     183the resulting audio stream. CD quality audio utilizes a 16-bit depth.
     184:row.
     185:c.Channels
     186:c.Number of audio channels in the file. Monaural audio contains a single
     187channel, stereo contains two, etc.
     188:etable.
     189:ehp2.
     190
     191.* ----------------------------------------------------------------------------
     192:h1 res=020.Ogg audio file
     193:p.This file is an Ogg audio file. It may be played using MMOS/2 when a suitable
     194Ogg MMIOProc has been installed. Ogg is actually a container format, and may
     195consist of audio (Vorbis or Opus format for lossy compressed audio, or FLAC or
     196OggPCM for lossless compressed audio) or video (Theora format, which is lossy).
     197
     198:p.The amount of loss in a Vorbis or Opus audio file may or may not be
     199acceptable. Usually, the amount may be controlled by the encoding tool. Once
     200encoded, however, it is not possible to restore the bits which have been
     201discarded without re-encoding the source file again with a lower degree of loss.
     202
     203:p.Ogg MMIOProcs for FLAC and Vorbis are included with ArcaOS 5.x and above.
     204Alternatively, these MMIOProcs are available in the MMAudio Pak 2 for OS/2&colon.
     205
     206:p.http&colon.//r6.ca/MMAudioPak/
     207
     208.* ----------------------------------------------------------------------------
     209:h1 res=030.CD audio track
     210:p.This file is a CD audio track. The track name and other info is queried from
     211a CDDB server if an internet connection is available. The information presented
     212here is read-only.
     213
     214:p.Most CDDB servers follow the FreeDB practice of requiring a valid email
     215address for access. Use the FreeDB Client configuration object in the Multimedia
     216folder to set this.
     217
     218:p.The user information is stored in the cddb.ini file in the installation
     219directory.
     220
     221.* ----------------------------------------------------------------------------
     222:h1 res=040.M3U playlist
     223:p.This file is an M3U (Moving Picture Experts Group Audio Layer 3 Uniform
     224Resource Locator) playlist. M3U is a :hp1.de facto:ehp1. standard, generally
     225recognized by most music players.
     226
     227:p.An M3U playlist is a text file which contains paths (URLs) to the tracks it
     228references.
     229
     230:p.To create a playlist, drag the M3U playlist template from the Multimedia
     231Templates folder to a suitable location on the desktop. Drag and drop media
     232files in the playlist container. To reorder, ensure that :hp1.Always maintain
     233sort order:ehp1. option on the :hp2.Sort:ehp2. submenu is deselected, as well
     234as any other sort options which might affect manual ordering, and drag and drop
     235the tracks as desired. Save the playlist by selecting :hp2.File | Save:ehp2.
     236from the menu.
     237
     238.* ----------------------------------------------------------------------------
     239:h1 res=050.Audio stream
     240:p.This object points to a stream provided by a streaming server on the LAN or
     241across the internet. The URL for the server is specified in the properties
     242notebook for the stream.
    159243
    160244:nt.
    161 Only Icecast server are supported. Servers using the shoutcast protocol won't work.
     245Only Icecast servers are supported. Servers using other protocols (Ampache,
     246SHOUTcast, QuickTime Broadcaster, Open Broadcast System, etc.) will not work.
    162247:ent.
    163248
     249.* ----------------------------------------------------------------------------
     250:h1 res=060.Convert audio file
     251:p.Specify the target audio file type and filename, including the full path.
     252Source audio file details are displayed at the top of the dialog. Note that some
     253formats may be more lossy than others, and converting from a lossy format to a
     254less-lossy (or lossless) format will not restore original bits which may no
     255longer be present in the (lossy) source file, and in some cases, may result in
     256a converted file of lower quality than the lossy source.
     257
     258:p.The dropdown will list available MMIOProcs (codecs) for the target file.
     259
     260:p.Press the :hp2.Convert:ehp2. button to begin the process, and
     261:hp2.Abort:ehp2. to cancel once conversion has begun. Press :hp2.Close:ehp2. to
     262exit the dialog.
     263
     264
     265.* ----------------------------------------------------------------------------
     266:h1 res=200.Image details
     267:p.This page displays various technical details about the selected image.
     268
     269:p.The following read-only information is provided&colon.
     270
     271:hp2.
     272:table rules=both frame=box cols='20 40'.
     273:row.
     274:c.Detail
     275:c.Description
     276:row.
     277:c.IOProc
     278:c.Identifies which MMIOProc is being used to render the image.
     279:row.
     280:c.Width
     281:c.Width in pixels of the image.
     282:row.
     283:c.Height
     284:c.Height in pixels of the image.
     285:row.
     286:c.Depth
     287:c.Number of colors (color depth) of the image.
     288:etable.
     289:ehp2.
     290
     291.* ----------------------------------------------------------------------------
     292:h1 res=210.Convert digital image
     293:p.Specify the target image file type and filename, including the full path.
     294A thumbnail of the source image file is displayed at the top of the dialog. Note
     295that some formats may be more lossy than others, and converting from a lossy
     296format to a less-lossy (or lossless) format will not restore original bits which
     297may no longer be present in the (lossy) source file, and in some cases, may
     298result in a converted file of lower quality than the lossy source.
     299
     300:p.The dropdown will list available MMIOProcs (codecs) for the target file.
     301
     302:p.Press the :hp2.Convert:ehp2. button to begin the process, and
     303:hp2.Abort:ehp2. to cancel once conversion has begun. Press :hp2.Close:ehp2. to
     304exit the dialog.
     305
    164306:euserdoc.

  • trunk/classes/res/en/cwaudio_en.rc

    r93 r103  
    3131MENU ID_MENU_EDITOR
    3232BEGIN
    33         MENUITEM "~Audioeditor", ID_MENU_EDITOR       
     33        MENUITEM "~Audio editor", ID_MENU_EDITOR       
    3434END
    3535
    … …  
    7777
    7878IDSTR_PLAYTIME      "Play time"
    79 IDSTR_SAMPLERATE    "Samplerate"
     79IDSTR_SAMPLERATE    "Sample rate"
    8080IDSTR_CHANNELS      "Channels"
    8181IDSTR_BPS           "Bits per sample"
    … …  
    113113;Used as an information when starting and audio file from the WPS
    114114IDSTR_STARTINGTRACK      "Starting track..."
    115 IDSTR_AUDIOSCANNING     "Scanning Audiofile..."
    116 IDSTR_AUDIOSTREAMTITLE  "Audio-Stream"
    117 IDSTR_STREAMURLPAGENAME "~URL-Setting"
    118 IDSTR_CDTRACKTITLE      "CD-Track"
     115IDSTR_AUDIOSCANNING     "Scanning audio file..."
     116IDSTR_AUDIOSTREAMTITLE  "Audio stream"
     117IDSTR_STREAMURLPAGENAME "~URL"
     118IDSTR_CDTRACKTITLE      "CD track"
    119119IDSTR_M3UTITLE          "M3U playlist"
    120120;Titles used when starting player and editor applications
    … …  
    127127
    128128END
    129 
    130 
Note: See TracChangeset for help on using the changeset viewer.