Changeset 105 for branches


Ignore:
Timestamp:
Oct 3, 2023, 12:24:50 PM (23 months ago)
Author:
erdmann
Message:

merge back from trunk

Location:
branches/v2.9_Lars
Files:
21 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/v2.9_Lars

  • branches/v2.9_Lars/JPGPROC/source/makefile

    r74 r105  
    6060#################################
    6161MAPSYM=mapsym
    62 LIBS=   MMPM2.LIB D:/usr/lib/GBM/GBM.LIB
     62GMBLIBPATH= D:/usr/lib/GBM
     63LIBS=   MMPM2.LIB $(GMBLIBPATH)/GBM.LIB
    6364LDFLAGS =       -Ge- /Gm+ -G4 /ss -Gl /O+ -Oc+ -Ol-  /Q+ /B"/NOE"
    6465

  • branches/v2.9_Lars/classes/c/c_audio/cwaudio.c

    r74 r105  
    264264      cwMoveNotebookButtonsWarp4(hwnd, IDPB_ID3HELP, 15);
    265265
    266       if(!getMessage(name, IDSTR_TRACKNAME, sizeof(name),  queryResModuleHandle(), hwnd))
    267         strcpy(name, "Track name");
    268       WinSetWindowText(WinWindowFromID(hwnd,IDGB_ID3TAGS), name);
     266      /*if(!getMessage(name, IDSTR_TRACKNAME, sizeof(name),  queryResModuleHandle(), hwnd))
     267        strcpy(name, "Track name");*/
     268      WinSetWindowText(WinWindowFromID(hwnd,IDGB_ID3TAGS), "");
    269269
    270270      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
    … …  
    274274      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
    275275      WinSendMsg(WinWindowFromID(hwnd,IDDD_ID3GENRE),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
    276 #if 0
    277       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Name)-1),0);
    278       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ARTIST),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Artist)-1),0);
    279       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ALBUM),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Album)-1),0);
    280       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3COMMENT),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Comment)-1),0);
    281       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Year)-1),0);
    282 #endif     
     276      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     277      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ARTIST),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     278      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ALBUM),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     279      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3COMMENT),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     280      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)4),0);
    283281      /* Fill drop downlist with knwon genres */
    284282      hwndTemp=WinWindowFromID(hwnd, IDDD_ID3GENRE);
    … …  
    450448  //We have a major tab so we need a name
    451449  if(!getMessage(pageName, ID_TRACKNAMEPAGENAME, sizeof(pageName), queryResModuleHandle(), hwndNotebook))
    452     strcpy(pageName, "~Track name");
     450    strcpy(pageName, "~Track meta data");
    453451  pageinfo.pszName = pageName;
    454452  //Insert the page into the settings notebook

  • branches/v2.9_Lars/classes/c/c_audio/cwcdtrack.c

    r74 r105  
    214214    MMCDTrackMethodDebug("MMCDTrack","cwcdtrack_wpFilterPopupMenu");
    215215
    216     return CTXT_SETTINGS | CTXT_HELP;
     216    return CTXT_SETTINGS | CTXT_HELP | CTXT_DELETE;
    217217
    218218    /* We don't want to have XFolder or WPS-Wizard menus here. These are useless

  • branches/v2.9_Lars/classes/help/de/makefile

    r2 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp       
    2323
    2424

  • branches/v2.9_Lars/classes/help/en/cwmm.ipf

    r91 r105  
    115115
    116116.* ----------------------------------------------------------------------------
    117 :h1 res=012.Track meta
     117:h1 res=012.Track meta data
    118118:p.Use this page to edit track information. Unlike an ID3 tag, the contents of
    119119these fields will be saved in the extended attributes of the file upon pressing

  • branches/v2.9_Lars/classes/help/en/makefile

    r2 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf  cwmm$(LANGUAGE).hlp     
    2323
    2424

  • branches/v2.9_Lars/classes/help/es/makefile

    r35 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp   
    2323
    2424

  • branches/v2.9_Lars/classes/help/fr/makefile

    r35 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp   
    2323
    2424

  • branches/v2.9_Lars/classes/help/it/makefile

    r2 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp       
    2323
    2424

  • branches/v2.9_Lars/classes/help/nl/makefile

    r2 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf  cwmm$(LANGUAGE).hlp
    2323
    2424

  • branches/v2.9_Lars/classes/help/ru/makefile

    r39 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp
    2323
    2424

  • branches/v2.9_Lars/classes/help/tw/makefile

    r4 r105  
    2020
    2121cwmm$(LANGUAGE).hlp:    cwmm$(LANGUAGE).ipf
    22         ipfc cwmm$(LANGUAGE).ipf       
     22        ipfc cwmm$(LANGUAGE).ipf cwmm$(LANGUAGE).hlp     
    2323
    2424

  • branches/v2.9_Lars/classes/idl/idl_audio/cwaudio.c

    r2 r105  
    251251      cwMoveNotebookButtonsWarp4(hwnd, IDPB_ID3HELP, 15);
    252252
    253       if(!getMessage(name, IDSTR_TRACKNAME, sizeof(name),  queryResModuleHandle(), hwnd))
    254         strcpy(name, "Track name");
    255       WinSetWindowText(WinWindowFromID(hwnd,IDGB_ID3TAGS), name);
     253      /*if(!getMessage(name, IDSTR_TRACKNAME, sizeof(name),  queryResModuleHandle(), hwnd))
     254        strcpy(name, "Track name");*/
     255      WinSetWindowText(WinWindowFromID(hwnd,IDGB_ID3TAGS), "");
    256256
    257257      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
    … …  
    261261      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
    262262      WinSendMsg(WinWindowFromID(hwnd,IDDD_ID3GENRE),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
    263 #if 0
    264       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Name)-1),0);
    265       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ARTIST),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Artist)-1),0);
    266       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ALBUM),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Album)-1),0);
    267       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3COMMENT),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Comment)-1),0);
    268       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Year)-1),0);
     263#if 1
     264      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     265      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ARTIST),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     266      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ALBUM),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     267      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3COMMENT),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
     268      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)4)-1),0);
    269269#endif     
    270270      /* Fill drop downlist with knwon genres */
    … …  
    399399  //We have a major tab so we need a name
    400400  if(!getMessage(pageName, ID_TRACKNAMEPAGENAME, sizeof(pageName), queryResModuleHandle(), hwndNotebook))
    401     strcpy(pageName, "~Track name");
     401    strcpy(pageName, "~Track meta data");
    402402  pageinfo.pszName = pageName;
    403403  //Insert the page into the settings notebook

  • branches/v2.9_Lars/classes/makefile

    r91 r105  
    192192        cd ./res && make
    193193        rc ./res/common_res/cwaudio.res cwmm.dll
    194         MAPSYM $(basename $@)
     194        MAPSYM cwmm.map
    195195
    196196###################################

  • branches/v2.9_Lars/classes/res/de/cwaudio_de.rc

    r4 r105  
    7171ID_WAVEINFOPAGENAME "~Audio-Information"
    7272ID_ID3TAGSPAGENAME  "~ID3-Tags"
    73 ID_TRACKNAMEPAGENAME "~Trackname"
     73ID_TRACKNAMEPAGENAME "~Track meta data"
    7474IDSTR_TRACKNAME      "Trackname"
    7575

  • branches/v2.9_Lars/classes/res/en/cwaudio_en.rc

    r91 r105  
    7272BEGIN
    7373ID_WAVEINFOPAGENAME "~Audio details"
    74 ID_ID3TAGSPAGENAME  "~ID3 tag"
    75 ID_TRACKNAMEPAGENAME "~Track meta"
    76 IDSTR_TRACKNAME      ""
     74ID_ID3TAGSPAGENAME  "~ID3 Tags"
     75ID_TRACKNAMEPAGENAME "~Track meta data"
     76IDSTR_TRACKNAME      "Trackname"
    7777
    7878IDSTR_PLAYTIME      "Play time"

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

    r91 r105  
    55CPPFLAGS  =  -Zdll -Zmt
    66INC             = ../../../include
    7 DEFS         = 
    8 PROGS        = 
     7DEFS         =
     8PROGS        =
    99ODIR            = .
    1010CPPDIR  = .
    … …  
    1313
    1414CPPFILES        =
    15 all:     pmcddb001.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll pmcddb088.dll pmcddb033.dll pmcddb034.dll
     15all:     pmcddb001.dll pmcddb007.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll pmcddb088.dll pmcddb033.dll pmcddb034.dll
    1616
    1717
    … …  
    2020                gcc -Zdll -Zomf -I$(INC) pmcddb001.c pmcddb001.def
    2121                rc pmcddb001.res pmcddb001.dll
    22 #               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb001.def
    2322
    24 pmcddb001.res:  pmcddb001.rc pmcddb001.dlg $(INC)\pmcddbres.h 
    25                 rc  -i $(INC) -r pmcddb001.rc 
     23pmcddb001.res:  pmcddb001.rc pmcddb001.dlg $(INC)\pmcddbres.h
     24                rc  -i $(INC) -r pmcddb001.rc
    2625
     26pmcddb007.dll:  pmcddb007.c pmcddb007.res
     27                gcc -Zdll -Zomf -I$(INC) pmcddb007.c pmcddb007.def
     28                rc pmcddb007.res pmcddb007.dll
    2729
     30pmcddb007.res:  pmcddb007.rc pmcddb007.dlg $(INC)\pmcddbres.h
     31                rc  -i $(INC) -r pmcddb007.rc
     32               
    2833pmcddb049.dll:  pmcddb049.c pmcddb049.res
    2934                gcc -Zdll -Zomf -I$(INC) pmcddb049.c pmcddb049.def
    3035                rc pmcddb049.res pmcddb049.dll
    3136
    32 pmcddb049.res:  pmcddb049.rc pmcddb049.dlg $(INC)\pmcddbres.h 
    33                 rc  -i $(INC) -r pmcddb049.rc 
     37pmcddb049.res:  pmcddb049.rc pmcddb049.dlg $(INC)\pmcddbres.h
     38                rc  -i $(INC) -r pmcddb049.rc
    3439
    3540pmcddb031.dll:  pmcddb031.c pmcddb031.res
    … …  
    3742                rc pmcddb031.res pmcddb031.dll
    3843
    39 pmcddb031.res:  pmcddb031.rc pmcddb031.dlg $(INC)\pmcddbres.h 
    40                 rc  -i $(INC) -r pmcddb031.rc 
     44pmcddb031.res:  pmcddb031.rc pmcddb031.dlg $(INC)\pmcddbres.h
     45                rc  -i $(INC) -r pmcddb031.rc
    4146
    4247pmcddb039.dll:  pmcddb039.c pmcddb039.res
    … …  
    4449                rc pmcddb039.res pmcddb039.dll
    4550
    46 pmcddb039.res:  pmcddb039.rc pmcddb039.dlg $(INC)\pmcddbres.h 
    47                 rc  -i $(INC) -r pmcddb039.rc 
     51pmcddb039.res:  pmcddb039.rc pmcddb039.dlg $(INC)\pmcddbres.h
     52                rc  -i $(INC) -r pmcddb039.rc
    4853
    4954pmcddb088.dll:  pmcddb088.c pmcddb088.res
    … …  
    5156                rc pmcddb088.res pmcddb088.dll
    5257
    53 pmcddb088.res:  pmcddb088.rc pmcddb039.dlg $(INC)\pmcddbres.h
    54                 rc  -i $(INC) -r pmcddb088.rc
     58pmcddb088.res:  pmcddb088.rc pmcddb039.dlg $(INC)\pmcddbres.h
     59                rc  -i $(INC) -r pmcddb088.rc
     60
     61pmcddb033.dll:  pmcddb033.c pmcddb033.res
     62                gcc -Zdll -Zomf -I$(INC) pmcddb033.c pmcddb033.def
     63                rc pmcddb033.res pmcddb033.dll
     64
     65pmcddb033.res:  pmcddb033.rc pmcddb033.dlg $(INC)\pmcddbres.h
     66                rc  -i $(INC) -r pmcddb033.rc
     67
     68pmcddb034.dll:  pmcddb034.c pmcddb034.res
     69                gcc -Zdll -Zomf -I$(INC) pmcddb034.c pmcddb034.def
     70                rc pmcddb034.res pmcddb034.dll
     71
     72pmcddb034.res:  pmcddb034.rc pmcddb034.dlg $(INC)\pmcddbres.h
     73                rc  -i $(INC) -r pmcddb034.rc
    5574
    5675pmcddb033.dll:  pmcddb033.c pmcddb033.res

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

    r91 r105  
    2020
    2121LIBRARY PMDB007 INITINSTANCE TERMINSTANCE
    22 DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB001.DLL)#@##1## 12.05.2002 18:17:00      ;-)  ::::1::@@Resource-DLL'
     22DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB007.DLL)#@##1## 12.05.2002 18:17:00      ;-)  ::::1::@@Resource-DLL'
    2323DATA MULTIPLE NONSHARED
    2424EXPORTS

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

    r91 r105  
    2222PSZ queryLanguage()
    2323{
    24   return "Taiwan (088)";
     24  return "Russian (007)";
    2525}

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

    r91 r105  
    1 ; .rc: Resource file 
     1; .rc: Resource file
    22;
    33;                    (C) Chris Wohlgemuth 1999-2002
    … …  
    3434
    3535IDSTR_INIFILEOPENWARNING  "à¥€ã¯à¥Š€¥­š¥! ¥ 〠ñâáï ®âªàëâì INI-ä ©« (cddb.ini)!"
    36 IDSTR_PMCDDBTITLE         "‡ ¯à®á FreeDB" 
     36IDSTR_PMCDDBTITLE         "‡ ¯à®á FreeDB"
    3737
    3838IDSTR_USAGE               "ˆá¯®«ì§ã©â¥ á«¥€ãîéãî ®¯æšî €«ï ­ áâனªš í«¥ªâà®­­®© ¯®çâë: /C <€€à¥á E-mail>"
    … …  
    4040END
    4141
    42 RCINCLUDE "pmcddb001.dlg"
     42RCINCLUDE "pmcddb007.dlg"
    4343

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

    r83 r105  
    1919
    2020LIBRARY PMDB049 INITINSTANCE TERMINSTANCE
    21 DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB001.DLL)#@##1## 12.05.2002 18:17:00      My ;-)  ::::1::@@Resource-DLL'
     21DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB049.DLL)#@##1## 12.05.2002 18:17:00      My ;-)  ::::1::@@Resource-DLL'
    2222DATA MULTIPLE NONSHARED
    2323EXPORTS
Note: See TracChangeset for help on using the changeset viewer.