Changeset 145

Timestamp:

03/07/07 17:07:57 (2 years ago)

Author:

mgeske2

Message:

Added 2 functions from the libvlc dll to play the next and previous tracks, and implemented them in BadClient?.

Files:

• dmp/trunk/BadClient/Form1.Designer.cs (modified) (7 diffs)
• dmp/trunk/BadClient/Form1.cs (modified) (1 diff)
• dmp/trunk/vlc.NET/NativeLibVlc.cs (modified) (2 diffs)
• dmp/trunk/vlc.NET/VlcUserControl.cs (modified) (1 diff)

dmp/trunk/BadClient/Form1.Designer.cs

@@ -32 +32 @@
-            this.lblStatus = new System.Windows.Forms.Label();
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.button5 = new System.Windows.Forms.Button();
-            this.button4 = new System.Windows.Forms.Button();
-            this.button3 = new System.Windows.Forms.Button();
@@ -48 +49 @@
-            this.colAlbum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colTrack = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.button6 = new System.Windows.Forms.Button();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
@@ -122 +124 @@
-            // splitContainer1.Panel1
-            // 
+            this.splitContainer1.Panel1.Controls.Add(this.button5);
-            this.splitContainer1.Panel1.Controls.Add(this.button4);
+            this.splitContainer1.Panel1.Controls.Add(this.button6);
-            this.splitContainer1.Panel1.Controls.Add(this.button3);
-            this.splitContainer1.Panel1.Controls.Add(this.btnListServers);
@@ -142 +146 @@
-            this.splitContainer1.TabIndex = 8;
-            // 
+            // button5
+            // 
+            this.button5.Location = new System.Drawing.Point(412, 8);
+            this.button5.Name = "button5";
+            this.button5.Size = new System.Drawing.Size(75, 23);
+            this.button5.TabIndex = 12;
+            this.button5.Text = "Previous";
+            this.button5.UseVisualStyleBackColor = true;
+            this.button5.Click += new System.EventHandler(this.button5_Click);
+            // 
-            // button4
-            // 
@@ -186 +200 @@
-            this.button2.Size = new System.Drawing.Size(108, 23);
-            this.button2.TabIndex = 6;
-
+\
-            this.button2.UseVisualStyleBackColor = true;
-            this.button2.Click += new System.EventHandler(this.button2_Click);
@@ -289 +303 @@
-            this.colTrack.Name = "colTrack";
-            this.colTrack.ReadOnly = true;
+            // 
+            // button6
+            // 
+            this.button6.Location = new System.Drawing.Point(493, 7);
+            this.button6.Name = "button6";
+            this.button6.Size = new System.Drawing.Size(75, 23);
+            this.button6.TabIndex = 13;
+            this.button6.Text = "Next";
+            this.button6.UseVisualStyleBackColor = true;
+            this.button6.Click += new System.EventHandler(this.button6_Click);
-            // 
-            // Form1
@@ -338 +362 @@
-        private System.Windows.Forms.DataGridViewTextBoxColumn colTrack;
-        private System.Windows.Forms.Button button4;
+        private System.Windows.Forms.Button button5;
+        private System.Windows.Forms.Button button6;
-    }
-}

dmp/trunk/BadClient/Form1.cs

@@ -126 +126 @@
-            this.button3.Text = "Pause";
-        }
+
+        private void button5_Click(object sender, EventArgs e)
+        {
+            this.vlcPlayer.PrevPlaylistTrack();
+        }
+
+        private void button6_Click(object sender, EventArgs e)
+        {
+            this.vlcPlayer.NextPlaylistTrack();
+        }
-        }
-}

dmp/trunk/vlc.NET/NativeLibVlc.cs

@@ -399 +399 @@
-                static extern void libvlc_playlist_play(ref libvlc_instance_t libvlc, Int32 id, 
-                        Int32 optionsCount, IntPtr optionsAlwaysNull, ref libvlc_exception_t p_exception);
+        [DllImport("libvlc")]
+        static extern void libvlc_playlist_next(ref libvlc_instance_t libvlc, ref libvlc_exception_t p_exception);
+        [DllImport("libvlc")]
+        static extern void libvlc_playlist_prev(ref libvlc_instance_t libvlc, ref libvlc_exception_t p_exception);
-                [DllImport("libvlc")]
-                static extern IntPtr libvlc_playlist_get_input(ref libvlc_instance_t libvlc, ref libvlc_exception_t p_exception);
@@ -1550 +1554 @@
-        }
-
+        public VlcError NextTrack()
+        {
+            try
+            {
+                using (VlcPlaylistObject vpobj = new VlcPlaylistObject(this.vlcHandle))
+                {
+                    if (vpobj.SubObject != IntPtr.Zero)
+                    {
+                        libvlc_playlist_next(ref vpobj.libvlc, ref vpobj.exception);
+                        if (!vpobj.exception.WasExceptionRaised())
+                        {
+                            return VlcError.Success;
+                        }
+                    }
+                }
+                return VlcError.Generic;
+            }
+            catch (Exception ex)
+            {
+                this.lastErrorMessage = ex.Message;
+                return VlcError.Exception;
+            }
+        }
+
+        public VlcError PrevTrack()
+        {
+            try
+            {
+                using (VlcPlaylistObject vpobj = new VlcPlaylistObject(this.vlcHandle))
+                {
+                    if (vpobj.SubObject != IntPtr.Zero)
+                    {
+                        libvlc_playlist_prev(ref vpobj.libvlc, ref vpobj.exception);
+                        if (!vpobj.exception.WasExceptionRaised())
+                        {
+                            return VlcError.Success;
+                        }
+                    }
+                }
+                return VlcError.Generic;
+            }
+            catch (Exception ex)
+            {
+                this.lastErrorMessage = ex.Message;
+                return VlcError.Exception;
+            }
+        }
+
-        public VlcError Stop()
-        {

dmp/trunk/vlc.NET/VlcUserControl.cs

@@ -1181 +1181 @@
-                }
-
+        public void NextPlaylistTrack()
+        {
+            this.nativeVlc.NextTrack();
+        }
+
+        public void PrevPlaylistTrack()
+        {
+            this.nativeVlc.PrevTrack();
+        }
+
-                public event MetaDataEventHandler NowPlaying;
-                // this 2nd event is a non-standard prototype needed for Com Interop event sourcing