Changeset 105 for branches/v2.9_Lars/classes/c

Timestamp:

Oct 3, 2023, 12:24:50 PM (23 months ago)

Author:

erdmann

Message:

merge back from trunk

Location:

branches/v2.9_Lars

Files:

• . (modified) (1 prop)
• classes/c/c_audio/cwaudio.c (modified) (3 diffs)
• classes/c/c_audio/cwcdtrack.c (modified) (1 diff)

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

@@ -264 +264 @@
       cwMoveNotebookButtonsWarp4(hwnd, IDPB_ID3HELP, 15);
 
-      if(!getMessage(name, IDSTR_TRACKNAME, sizeof(name),  queryResModuleHandle(), hwnd))
-        strcpy(name, "Track name");
-      WinSetWindowText(WinWindowFromID(hwnd,IDGB_ID3TAGS), name);
+      /*if(!getMessage(name, IDSTR_TRACKNAME, sizeof(name),  queryResModuleHandle(), hwnd))
+        strcpy(name, "Track name");*/
+      WinSetWindowText(WinWindowFromID(hwnd,IDGB_ID3TAGS), "");
 
       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
@@ -274 +274 @@
       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
       WinSendMsg(WinWindowFromID(hwnd,IDDD_ID3GENRE),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)MAX_EA_SIZE-1),0);
-#if 0
-      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Name)-1),0);
-      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ARTIST),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Artist)-1),0);
-      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ALBUM),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Album)-1),0);
-      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3COMMENT),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Comment)-1),0);
-      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(_id3Year)-1),0);
-#endif      
+      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3NAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
+      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ARTIST),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
+      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ALBUM),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
+      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3COMMENT),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
+      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)4),0);
       /* Fill drop downlist with knwon genres */
       hwndTemp=WinWindowFromID(hwnd, IDDD_ID3GENRE);
@@ -450 +448 @@
   //We have a major tab so we need a name
   if(!getMessage(pageName, ID_TRACKNAMEPAGENAME, sizeof(pageName), queryResModuleHandle(), hwndNotebook))
-    strcpy(pageName, "~Track name");
+    strcpy(pageName, "~Track meta data");
   pageinfo.pszName = pageName;
   //Insert the page into the settings notebook

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

@@ -214 +214 @@
     MMCDTrackMethodDebug("MMCDTrack","cwcdtrack_wpFilterPopupMenu");
 
-    return CTXT_SETTINGS | CTXT_HELP;
+    return CTXT_SETTINGS | CTXT_HELP | CTXT_DELETE;
 
     /* We don't want to have XFolder or WPS-Wizard menus here. These are useless