Create files to support NSMovie and NSMovieView

ChangeLog

@@ -1,3 +1,20 @@
+2025-05-29 Gregory John Casamento <[email protected]>
+
+	* config.make.in
+	* configure
+	* configure.ac
+	* Headers/Additions/GNUstepGUI/config.h.in
+	* Headers/AppKit/NSMovie.h
+	* Headers/AppKit/NSMovieView.h
+	* Source/GNUmakefile
+	* Source/GNUmakefile.preamble
+	* Source/GSMovieView.h
+	* Source/GSMovieView.m
+	* Source/NSMovie.m
+	* Source/NSMovieView.m
+	* Source/NSSound.m: Cleanup NSSound, add support for playing ffmpeg
+	movies using NSMovie, NSMovieView.
+
 2025-04-30 Gregory John Casamento <[email protected]>
 
 	* Headers/AppKit/NSColorSpace.h: Add NSColorSpaceModel* enumerated values.

Headers/Additions/GNUstepGUI/config.h.in

@@ -148,6 +148,9 @@
 /* MagickCore >= 7 */
 #undef MAGICKCORE_7_OR_NEWER
 
+/* avcodec */
+#undef HAVE_AVCODEC
+
 /* mntent structure member name */
 #undef MNT_FSNAME
 

Headers/AppKit/NSMovie.h

@@ -4,6 +4,8 @@
 
    Copyright <copy>(C) 2003 Free Software Foundation, Inc.</copy>
 
+   Author: Gregory John Casamento <[email protected]>
+   Date: May 2025
    Author: Fred Kiefer <[email protected]>
    Date: March 2003
 
@@ -41,19 +43,49 @@ APPKIT_EXPORT_CLASS
 @interface NSMovie : NSObject <NSCopying, NSCoding> 
 {
   @private
-    NSData*  _movie;
-    NSURL*   _url;
+    NSData*   _movie;
+    NSURL*    _url;
+    BOOL      _tmp;
 }
 
+/**
+ * An array of all of the types NSMovie can support.
+ */
 + (NSArray*) movieUnfilteredFileTypes;
+
+/**
+ * An array of all of the pasteboard types NSMovie can support.
+ */
 + (NSArray*) movieUnfilteredPasteboardTypes;
+
+/**
+ * Returns YES, if the object can be initialized with the given pasteboard.
+ */
 + (BOOL) canInitWithPasteboard: (NSPasteboard*)pasteboard;
 
-- (id) initWithMovie: (void*)movie;
-- (id) initWithURL: (NSURL*)url byReference: (BOOL)byRef;
-- (id) initWithPasteboard: (NSPasteboard*)pasteboard;
+/**
+ * Returns an NSMovie with the raw data pointed to by movie.
+ */
+- (instancetype) initWithMovie: (void*)movie;
+
+/**
+ * Returns an NSMovie with the given URL. byRef should be YES if it is by reference.
+ */
+- (instancetype) initWithURL: (NSURL*)url byReference: (BOOL)byRef;
 
+/**
+ * Returns an NSMovie initialized with the pasteboard passed in.
+ */
+- (instancetype) initWithPasteboard: (NSPasteboard*)pasteboard;
+
+/**
+ * Returns the raw data for the movie.
+ */
 - (void*) QTMovie;
+
+/**
+ * Returns the URL of the movie to be played.
+ */
 - (NSURL*) URL;
 
 @end

Headers/AppKit/NSMovieView.h

@@ -4,6 +4,8 @@
 
    Copyright <copy>(C) 2003 Free Software Foundation, Inc.</copy>
 
+   Author: Gregory John Casamento <[email protected]>
+   Date: May 2025
    Author: Fred Kiefer <[email protected]>
    Date: March 2003
 
@@ -28,10 +30,12 @@
 
 #ifndef _GNUstep_H_NSMovieView
 #define _GNUstep_H_NSMovieView
-#import <AppKit/AppKitDefines.h>
 
+#import <AppKit/AppKitDefines.h>
+#import <AppKit/NSNibDeclarations.h>
 #import <AppKit/NSView.h>
 
+@class NSTextField;
 @class NSMovie;
 
 typedef enum {
@@ -43,66 +47,210 @@ typedef enum {
 APPKIT_EXPORT_CLASS
 @interface NSMovieView : NSView
 {
-  @protected
-    NSMovie* _movie;
-    float _rate;
-    float _volume;
-    struct NSMovieViewFlags {
-      unsigned int muted: 1;
-      unsigned int loopMode: 3;
-      unsigned int plays_selection_only: 1;
-      unsigned int plays_every_frame: 1;
-      unsigned int is_controller_visible: 1;
-      unsigned int editable: 1;
-      unsigned int reserved: 24;
-    } _flags;
+  IBOutlet NSTextField *_statusField;
+  NSMovie* _movie;
+
+  float _rate;
+  float _volume;
+  BOOL _playing;
+  struct NSMovieViewFlags {
+    unsigned int muted: 1;
+    unsigned int loopMode: 3;
+    unsigned int plays_selection_only: 1;
+    unsigned int plays_every_frame: 1;
+    unsigned int is_controller_visible: 1;
+    unsigned int editable: 1;
+    unsigned int reserved: 24;
+  } _flags;
 }
 
+/**
+ * Set the movie to be displayed in the view.
+ */
 - (void) setMovie: (NSMovie*)movie;
+
+/**
+ * Get the current movie displayed in the view.
+ */
 - (NSMovie*) movie;
 
-- (void) start: (id)sender;
-- (void) stop: (id)sender;
+/**
+ * Start movie playback.
+ */
+- (IBAction) start: (id)sender;
+
+/**
+ * Stop movie playback.
+ */
+- (IBAction) stop: (id)sender;
+
+/**
+ * Check whether the movie is currently playing.
+ */
 - (BOOL) isPlaying;
 
-- (void) gotoPosterFrame: (id)sender;
-- (void) gotoBeginning: (id)sender;
-- (void) gotoEnd: (id)sender;
-- (void) stepForward: (id)sender;
-- (void) stepBack: (id)sender;
+/**
+ * Go to the movie's poster frame.
+ */
+- (IBAction) gotoPosterFrame: (id)sender;
+
+/**
+ * Move to the beginning of the movie.
+ */
+- (IBAction) gotoBeginning: (id)sender;
+
+/**
+ * Move to the end of the movie.
+ */
+- (IBAction) gotoEnd: (id)sender;
+
+/**
+ * Step forward one frame in the movie.
+ */
+- (IBAction) stepForward: (id)sender;
 
+/**
+ * Step backward one frame in the movie.
+ */
+- (IBAction) stepBack: (id)sender;
+
+/**
+ * Set the playback rate for the movie.
+ */
 - (void) setRate: (float)rate;
+
+/**
+ * Get the current playback rate.
+ */
 - (float) rate;
 
+/**
+ * Set the playback volume.
+ */
 - (void) setVolume: (float)volume;
+
+/**
+ * Get the current playback volume.
+ */
 - (float) volume;
+
+/**
+ * Mute or unmute the playback.
+ */
 - (void) setMuted: (BOOL)mute;
+
+/**
+ * Return whether the playback is muted.
+ */
 - (BOOL) isMuted;
 
+/**
+ * Set the loop mode for playback.
+ */
 - (void) setLoopMode: (NSQTMovieLoopMode)mode;
+
+/**
+ * Get the current loop mode.
+ */
 - (NSQTMovieLoopMode) loopMode;
+
+/**
+ * Set whether only the selected portion should play.
+ */
 - (void) setPlaysSelectionOnly: (BOOL)flag;
+
+/**
+ * Return whether only the selection is played.
+ */
 - (BOOL) playsSelectionOnly;
+
+/**
+ * Set whether to play every frame regardless of timing.
+ */
 - (void) setPlaysEveryFrame: (BOOL)flag;
+
+/**
+ * Return whether every frame is being played.
+ */
 - (BOOL) playsEveryFrame;
 
+/**
+ * Show or hide the movie controller and optionally adjust view size.
+ */
 - (void) showController: (BOOL)show adjustingSize: (BOOL)adjustSize;
+
+/**
+ * Get a pointer to the movie controller.
+ */
 - (void*) movieController;
+
+/**
+ * Check whether the controller is currently visible.
+ */
 - (BOOL) isControllerVisible;
 
+/**
+ * Get the rectangle in which the movie is displayed.
+ */
 - (NSRect) movieRect;
+
+/**
+ * Resize the view based on a magnification factor.
+ */
 - (void) resizeWithMagnification: (float)magnification;
+
+/**
+ * Calculate the size of the view at a given magnification.
+ */
 - (NSSize) sizeForMagnification: (float)magnification;
 
+/**
+ * Set whether the movie view is editable.
+ */
 - (void) setEditable: (BOOL)editable;
+
+/**
+ * Return whether the movie view is editable.
+ */
 - (BOOL) isEditable;
 
-- (void) cut: (id)sender;
-- (void) copy: (id)sender;
-- (void) paste: (id)sender;
-- (void) clear: (id)sender;
-- (void) undo: (id)sender;
-- (void) selectAll: (id)sender;
+/**
+ * Cut the selected movie content.
+ */
+- (IBAction) cut: (id)sender;
+
+/**
+ * Copy the selected movie content.
+ */
+- (IBAction) copy: (id)sender;
+
+/**
+ * Paste movie content from the pasteboard.
+ */
+- (IBAction) paste: (id)sender;
+
+/**
+ * Clear the selected movie content.
+ */
+- (IBAction) clear: (id)sender;
+
+/**
+ * Undo the last operation.
+ */
+- (IBAction) undo: (id)sender;
+
+/**
+ * Select all content in the movie view.
+ */
+- (IBAction) selectAll: (id)sender;
+
+/**
+ * GNUstep extension, this allows the user to set a
+ * text field to monitor the status of the movie view.
+ *
+- (void) setStatusField: (id)field;
+- (id) statusField;
+*/
 
 @end
 

Source/GNUmakefile

@@ -374,7 +374,14 @@ GSCSStrength.m \
 GSCSEditInfo.m \
 GSCSEditVariableManager.m \
 GSCSTableau.m \
-GSColorSliderCell.m
+GSColorSliderCell.m \
+GSRingBuffer.m
+
+ifeq ($(BUILD_MOVIE), yes)
+libgnustep-gui_OBJC_FILES += GSMovieView.m
+libgnustep-gui_OBJC_FILES += GSAudioPlayer.m
+libgnustep-gui_OBJC_FILES += GSAVUtils.m
+endif
 
 # Turn off NSMenuItem warning that NSMenuItem conforms to <NSObject>,
 # but does not implement <NSObject>'s methods itself (it inherits

Source/GNUmakefile.preamble

@@ -52,7 +52,7 @@ endif
 ADDITIONAL_OBJCFLAGS = -Wall
 
 # Additional flags to pass to the C compiler
-# ADDITIONAL_CFLAGS =
+ADDITIONAL_CFLAGS += $(MOVIE_BASE_CFLAGS) $(SOUND_CFLAGS)
 
 # Additional include directories the compiler should search
 ADDITIONAL_INCLUDE_DIRS += -I../Headers/Additions -I../Headers \
@@ -62,7 +62,7 @@ ADDITIONAL_INCLUDE_DIRS += -I../Headers/Additions -I../Headers \
 # ADDITIONAL_LDFLAGS = 
 
 # Additional library directories the linker should search
-# ADDITIONAL_LIB_DIRS = 
+ADDITIONAL_LIB_DIRS += $(MOVIE_BASE_LIBS) $(SOUND_LIBS)
 
 #
 # Sparc systems cannot load tiff files due to some problem compiling