[xiph-commits] r7314 - in trunk/oggdsf: build/oggcodecs
illiminable at dactyl.lonelymoon.com
illiminable
Sat Jul 24 05:27:58 PDT 2004
src/lib/core/ogg/libVorbisCommentDotNET src/tools/iOCE
Message-ID: <20040724122758.A42169AAAB at dactyl.lonelymoon.com>
Author: illiminable
Date: Sat Jul 24 05:27:58 2004
New Revision: 7314
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.cpp
trunk/oggdsf/src/tools/iOCE/frmMain.cs
trunk/oggdsf/src/tools/iOCE/frmMain.resx
trunk/oggdsf/src/tools/iOCE/iOCE.csproj
Log:
* .NET Comment Editor utility now displays the comments, but they are not yet editable.
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-07-24 11:31:48 UTC (rev 7313)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-07-24 12:27:57 UTC (rev 7314)
@@ -118,6 +118,12 @@
"Entry"
{
"MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "OwnerKey" = "8:_8B196B598C8B4033B13B43E0E7A63185"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
"OwnerKey" = "8:_7F96FF7D00B84764BBB42C4AA1EEAF39"
"MsmSig" = "8:_UNDEFINED"
}
@@ -286,6 +292,12 @@
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_8B196B598C8B4033B13B43E0E7A63185"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
"OwnerKey" = "8:_7F96FF7D00B84764BBB42C4AA1EEAF39"
"MsmSig" = "8:_UNDEFINED"
}
@@ -561,6 +573,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_8B196B598C8B4033B13B43E0E7A63185"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -580,6 +598,12 @@
"Entry"
{
"MsmKey" = "8:_91763CD4DC02EBA9D077B963E618A278"
+ "OwnerKey" = "8:_8B196B598C8B4033B13B43E0E7A63185"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_91763CD4DC02EBA9D077B963E618A278"
"OwnerKey" = "8:_7F96FF7D00B84764BBB42C4AA1EEAF39"
"MsmSig" = "8:_UNDEFINED"
}
@@ -682,6 +706,12 @@
"Entry"
{
"MsmKey" = "8:_E19E6FA89F3A4FEEBA28405C19EAE0FD"
+ "OwnerKey" = "8:_8B196B598C8B4033B13B43E0E7A63185"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_E19E6FA89F3A4FEEBA28405C19EAE0FD"
"OwnerKey" = "8:_36F567FA964BFBEAAC7524D44D4A26C7"
"MsmSig" = "8:_UNDEFINED"
}
@@ -1188,7 +1218,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{EF61A700-92D2-4817-8244-5F788156D2F0}"
- "PackageCode" = "8:{80E58C5D-6A86-4239-A3AB-F67B99DBF8E9}"
+ "PackageCode" = "8:{C6B230AA-7283-4848-820A-7D41AC54325D}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
@@ -3208,6 +3238,34 @@
{
}
}
+ "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8B196B598C8B4033B13B43E0E7A63185"
+ {
+ "SourcePath" = "8:..\\..\\sln\\oggdsf_all\\debug\\libVorbisCommentDotNET.dll"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ "ProjectOutputGroupRegister" = "3:1"
+ "OutputConfiguration" = "8:"
+ "OutputGroupCanonicalName" = "8:Built"
+ "OutputProjectGuid" = "8:{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}"
+ "ShowKeyOutput" = "11:TRUE"
+ "ExcludeFilters"
+ {
+ }
+ }
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8D9A2E4C592D4118B80A4AE8394D8963"
{
"SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Debug\\dsfSpeexEncoder.dll"
Modified: trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.cpp 2004-07-24 11:31:48 UTC (rev 7313)
+++ trunk/oggdsf/src/lib/core/ogg/libVorbisCommentDotNET/DNFileComments.cpp 2004-07-24 12:27:57 UTC (rev 7314)
@@ -21,7 +21,8 @@
bool DNFileComments::loadFile(String* inFileName) {
char* locCS = Wrappers::netStrToCStr(inFileName);
- bool locRet = mNativeClass->loadFile(locCS);
+ string locStr = locCS;
+ bool locRet = mNativeClass->loadFile(locStr);
Wrappers::releaseCStr(locCS);
return locRet;
}
Modified: trunk/oggdsf/src/tools/iOCE/frmMain.cs
===================================================================
--- trunk/oggdsf/src/tools/iOCE/frmMain.cs 2004-07-24 11:31:48 UTC (rev 7313)
+++ trunk/oggdsf/src/tools/iOCE/frmMain.cs 2004-07-24 12:27:57 UTC (rev 7314)
@@ -20,7 +20,6 @@
private System.Windows.Forms.Label lblVendor;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.TextBox txtVendorString;
- private System.Windows.Forms.ListView listView1;
private System.Windows.Forms.ColumnHeader colKey;
private System.Windows.Forms.ColumnHeader colValue;
/// <summary>
@@ -28,6 +27,7 @@
/// </summary>
private System.ComponentModel.Container components = null;
private System.Windows.Forms.OpenFileDialog dlgOpenFile;
+ private System.Windows.Forms.ListView lsvUserComments;
private illiminable.Ogg.libVorbisCommentDotNET.DNFileComments mFileComments;
@@ -35,6 +35,22 @@
private void fillFields()
{
txtVendorString.Text = mFileComments.getStreamComment(0).comments().vendorString();
+ String[] locSubItems = null;
+ ListViewItem locItem = null;
+
+ for (int i = 0; i < mFileComments.getStreamComment(0).comments().numUserComments(); i++)
+ {
+ locSubItems = new String[2];
+
+ locSubItems[0] = mFileComments.getStreamComment(0).comments().getUserComment(i).key();
+ locSubItems[1] = mFileComments.getStreamComment(0).comments().getUserComment(i).value();
+ locItem = new ListViewItem(locSubItems);
+ lsvUserComments.Items.Add(locItem);
+ }
+
+
+
+
}
public frmMain()
{
@@ -77,10 +93,10 @@
this.mnuFileExit = new System.Windows.Forms.MenuItem();
this.lblVendor = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.txtVendorString = new System.Windows.Forms.TextBox();
- this.listView1 = new System.Windows.Forms.ListView();
+ this.lsvUserComments = new System.Windows.Forms.ListView();
this.colKey = new System.Windows.Forms.ColumnHeader();
this.colValue = new System.Windows.Forms.ColumnHeader();
+ this.txtVendorString = new System.Windows.Forms.TextBox();
this.dlgOpenFile = new System.Windows.Forms.OpenFileDialog();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
@@ -126,7 +142,7 @@
//
// groupBox1
//
- this.groupBox1.Controls.Add(this.listView1);
+ this.groupBox1.Controls.Add(this.lsvUserComments);
this.groupBox1.Controls.Add(this.txtVendorString);
this.groupBox1.Controls.Add(this.lblVendor);
this.groupBox1.Location = new System.Drawing.Point(16, 72);
@@ -136,26 +152,18 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Vorbis Comments";
//
- // txtVendorString
+ // lsvUserComments
//
- this.txtVendorString.Location = new System.Drawing.Point(120, 16);
- this.txtVendorString.Name = "txtVendorString";
- this.txtVendorString.Size = new System.Drawing.Size(496, 20);
- this.txtVendorString.TabIndex = 1;
- this.txtVendorString.Text = "";
+ this.lsvUserComments.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.colKey,
+ this.colValue});
+ this.lsvUserComments.GridLines = true;
+ this.lsvUserComments.Location = new System.Drawing.Point(16, 48);
+ this.lsvUserComments.Name = "lsvUserComments";
+ this.lsvUserComments.Size = new System.Drawing.Size(600, 128);
+ this.lsvUserComments.TabIndex = 2;
+ this.lsvUserComments.View = System.Windows.Forms.View.Details;
//
- // listView1
- //
- this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.colKey,
- this.colValue});
- this.listView1.GridLines = true;
- this.listView1.Location = new System.Drawing.Point(16, 48);
- this.listView1.Name = "listView1";
- this.listView1.Size = new System.Drawing.Size(600, 128);
- this.listView1.TabIndex = 2;
- this.listView1.View = System.Windows.Forms.View.Details;
- //
// colKey
//
this.colKey.Text = "Key";
@@ -166,6 +174,14 @@
this.colValue.Text = "Value";
this.colValue.Width = 430;
//
+ // txtVendorString
+ //
+ this.txtVendorString.Location = new System.Drawing.Point(120, 16);
+ this.txtVendorString.Name = "txtVendorString";
+ this.txtVendorString.Size = new System.Drawing.Size(496, 20);
+ this.txtVendorString.TabIndex = 1;
+ this.txtVendorString.Text = "";
+ //
// frmMain
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
Modified: trunk/oggdsf/src/tools/iOCE/frmMain.resx
===================================================================
--- trunk/oggdsf/src/tools/iOCE/frmMain.resx 2004-07-24 11:31:48 UTC (rev 7313)
+++ trunk/oggdsf/src/tools/iOCE/frmMain.resx 2004-07-24 12:27:57 UTC (rev 7314)
@@ -157,24 +157,15 @@
<data name="groupBox1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
- <data name="txtVendorString.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="txtVendorString.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <data name="lsvUserComments.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</data>
- <data name="txtVendorString.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <data name="lsvUserComments.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
- <data name="listView1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="listView1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <data name="lsvUserComments.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
- <data name="listView1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
<data name="colKey.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
@@ -187,6 +178,15 @@
<data name="colValue.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
+ <data name="txtVendorString.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
+ <data name="txtVendorString.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </data>
+ <data name="txtVendorString.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>Private</value>
+ </data>
<data name="dlgOpenFile.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>Private</value>
</data>
@@ -208,12 +208,12 @@
<data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</data>
+ <data name="$this.Name">
+ <value>frmMain</value>
+ </data>
<data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>8, 8</value>
</data>
- <data name="$this.Name">
- <value>frmMain</value>
- </data>
<data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</data>
Modified: trunk/oggdsf/src/tools/iOCE/iOCE.csproj
===================================================================
--- trunk/oggdsf/src/tools/iOCE/iOCE.csproj 2004-07-24 11:31:48 UTC (rev 7313)
+++ trunk/oggdsf/src/tools/iOCE/iOCE.csproj 2004-07-24 12:27:57 UTC (rev 7314)
@@ -86,7 +86,7 @@
/>
<Reference
Name = "System.XML"
- AssemblyName = "System.XML"
+ AssemblyName = "System.Xml"
HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
/>
<Reference
@@ -104,6 +104,7 @@
/>
<File
RelPath = "AssemblyInfo.cs"
+ SubType = "Code"
BuildAction = "Compile"
/>
<File
More information about the commits
mailing list