[xiph-commits] r7973 - in trunk/oggdsf/src: lib/codecs/flac/libs/libflac/include/FLAC tools/DNPlay

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-10-11 00:58:47 -0700 (Mon, 11 Oct 2004)
New Revision: 7973

Added:
   trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.bak
Modified:
   trunk/oggdsf/src/tools/DNPlay/frmDNPlay.cs
Log:
* Seperate the UI from the implementation better in DNPlay

Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.bak
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.bak	2004-10-11 04:56:24 UTC (rev 7972)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/ordinals.h.bak	2004-10-11 07:58:47 UTC (rev 7973)
@@ -0,0 +1,74 @@
+/* libFLAC - Free Lossless Audio Codec library
+ * Copyright (C) 2000,2001,2002,2003,2004  Josh Coalson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Xiph.org Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FLAC__ORDINALS_H
+#define FLAC__ORDINALS_H
+
+#ifndef _MSC_VER
+#include <inttypes.h>
+#endif
+
+typedef signed char FLAC__int8;
+typedef unsigned char FLAC__uint8;
+
+#if defined _MSC_VER
+typedef __int16 FLAC__int16;
+typedef __int32 FLAC__int32;
+typedef __int64 FLAC__int64;
+typedef unsigned __int16 FLAC__uint16;
+typedef unsigned __int32 FLAC__uint32;
+typedef unsigned __int64 FLAC__uint64;
+#else
+typedef int16_t FLAC__int16;
+typedef int32_t FLAC__int32;
+typedef int64_t FLAC__int64;
+typedef uint16_t FLAC__uint16;
+typedef uint32_t FLAC__uint32;
+typedef uint64_t FLAC__uint64;
+#endif
+
+typedef int FLAC__bool;
+
+typedef FLAC__uint8 FLAC__byte;
+typedef float FLAC__real;
+
+#ifdef true
+#undef true
+#endif
+#ifdef false
+#undef false
+#endif
+#ifndef __cplusplus
+#define true 1
+#define false 0
+#endif
+
+#endif

Modified: trunk/oggdsf/src/tools/DNPlay/frmDNPlay.cs
===================================================================
--- trunk/oggdsf/src/tools/DNPlay/frmDNPlay.cs	2004-10-11 04:56:24 UTC (rev 7972)
+++ trunk/oggdsf/src/tools/DNPlay/frmDNPlay.cs	2004-10-11 07:58:47 UTC (rev 7973)
@@ -368,9 +368,7 @@
 		}
 
 		
-
-		
-		private void menuItem3_Click(object sender, System.EventArgs e)
+		private void OpenFile() 
 		{
 			//File->Open
 			dlgOpenFile.CheckFileExists = true;
@@ -393,10 +391,16 @@
 				mPlayer.setCMMLCallbacks(this);
 				cmdPlay.Enabled = true;
 			}
+
+		}
+		
+		private void menuItem3_Click(object sender, System.EventArgs e)
+		{
+			OpenFile();
 			
 		}
 
-		private void cmdPlay_Click(object sender, System.EventArgs e)
+		private void StartPlayback() 
 		{
 			mPlayer.play();
 			tmrUpdateDuration.Enabled = true;
@@ -405,8 +409,12 @@
 			cmdPause.Enabled = true;
 			cmdStop.Enabled = true;
 		}
+		private void cmdPlay_Click(object sender, System.EventArgs e)
+		{
+			StartPlayback();
+		}
 
-		private void cmdStop_Click(object sender, System.EventArgs e)
+		private void StopPlayback() 
 		{
 			tmrUpdateDuration.Enabled = false;
 			tmrEventCheck.Enabled = false;
@@ -420,8 +428,12 @@
 			cmdStop.Enabled = false;
 			cmdPlay.Enabled = true;
 		}
+		private void cmdStop_Click(object sender, System.EventArgs e)
+		{
+			StopPlayback();
+		}
 
-		private void cmdPause_Click(object sender, System.EventArgs e)
+		private void PausePlayback() 
 		{
 			tmrEventCheck.Enabled = false;
 			tmrUpdateDuration.Enabled = false;
@@ -430,6 +442,10 @@
 			cmdPlay.Enabled = true;
 			cmdStop.Enabled = true;
 		}
+		private void cmdPause_Click(object sender, System.EventArgs e)
+		{
+			PausePlayback();
+		}
 
 		private void frmDNPlay_Load(object sender, System.EventArgs e)
 		{