Implemented some comments

Author: Federica

demos/CPP_playVideoFramesDemo.m demos/video/CPP_playVideoFramesDemo.mdemos/CPP_playVideoFramesDemo.m renamed to demos/video/CPP_playVideoFramesDemo.m

@@ -2,7 +2,8 @@
 
 %% Demo showing how to use the createFramesTextureStructure and playVideoFrames functions
 
-% This small script shows how to use the getReponse function
+% as it is, it presents two example videos in succession
+
 
 % add parent directory to matlab path (so we can access the CPP_PTB functions)
 addpath(fullfile(pwd, '..'));
@@ -30,31 +31,62 @@
     [cfg.screen.win, cfg.screen.winRect] = Screen('OpenWindow', cfg.screen.idx, cfg.color.background);
 
 
-%% Video related info
+%% Strcuture for video related info
 
     % The name of your "video" and its images format
-    cfg.video.name = 'coffee';
+    video.names = {'coffee','leaves'};
+    
+    % The number of frames of your video you want to present
+    % If left empty, all available frames are taken
+    video.frame.numbers = [];
+    % video.frame.numbers = 30;
+    % video.frame.numbers = [30,15];
 
     % The format fo the images
-    cfg.video.frame.format = '.jpeg'; % can be any img format compatible with the "imread" function
+    video.frame.format = '.jpeg'; % can be any img format compatible with the "imread" function
 
     % the folder where the images are (from the current folder)
-    cfg.video.path = '/video_frames/';
+    video.stimuli.folder = 'stimuli/';
 
     % The frame rate at which you want to present your video
-    cfg.video.frame.rate = 29.97;
+    video.frame.rate = 29.97;
 
-    % The number of frames of your video you want to present
-    cfg.video.frame.number = 30;
+    % Time bw videos in s
+    video.isi = 1;
 
+    
+%% present the videos in a loop
 
+    for trial = 1:length(video.names)
+        
+    % select name and folder where current video is
+    video.name = video.names{trial};
+    video.path = fullfile(video.stimuli.folder,video.name);
+    
+    
+    % how many frames are going to be presented
+    if numel(video.frame.numbers) < 1
+        video.frame.number = size(dir([video.path,'/*',video.frame.format]),1);
+        
+    elseif numel(video.frame.numbers) > 1
+        video.frame.number = video.frame.numbers(trial);
+    
+    else
+        video.frame.number = video.frame.numbers;
+    end
+        
+    
     % Read the images and create the stucture with their textures
-    cfg = createFramesTextureStructure(cfg);
-
+    [video, cfg] = createFramesTextureStructure(video, cfg);
 
     % Play the video
-    playVideoFrames(cfg);
+    playVideoFrames(video, cfg);
+    
+    % ISI (better would be to use Flip)
+    WaitSecs(video.isi);
+    
+    end
 
 
     % The end
-    sca;
+    sca;