Merge pull request #797 from AI4Bharat/master-resolved-conflicts

Update to latest master
AI4Bharat · Aug 14, 2024 · 12b5a8b · 12b5a8b
2 parents b192b70 + e951d7c
commit 12b5a8b
Show file tree

Hide file tree

Showing 16 changed files with 221 additions and 129 deletions.
diff --git a/src/common/CustomMenuComponent.jsx b/src/common/CustomMenuComponent.jsx
@@ -21,6 +21,8 @@ const CustomMenuComponent = ({
   setShowSubtitles,
   showTimeline,
   setShowTimeline,
+  useYtdlp,
+  setUseYtdlp,
 }) => {
   const player = useSelector((state) => state.commonReducer.player);
 
@@ -109,6 +111,19 @@ const CustomMenuComponent = ({
               <input type="checkbox" checked={showTimeline} onChange={() => {setShowTimeline(!showTimeline)}}/>
             </div>
           </MenuItem>
+          <MenuItem key="Youtube Player">
+            <div
+              style={{
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "space-between",
+                width: "100%",
+              }}
+            >
+              <span>Youtube Player</span>
+              <input type="checkbox" checked={!useYtdlp} onChange={() => {setUseYtdlp(!useYtdlp)}}/>
+            </div>
+          </MenuItem>
       </Menu>
 
       <Menu

diff --git a/src/common/ExportDialog.jsx b/src/common/ExportDialog.jsx
@@ -69,7 +69,7 @@ const ExportDialog = ({
       PaperProps={{ style: { borderRadius: "10px" } }}
     >
       <DialogTitle variant="h4" display="flex" alignItems={"center"}>
-        <Typography variant="h4">Export Subtitles</Typography>{" "}
+        <Typography variant="h4">Export Voiceover</Typography>{" "}
         <IconButton
           aria-label="close"
           onClick={handleClose}
@@ -172,7 +172,7 @@ const ExportDialog = ({
         ) : (
           <></>
         )}
-
+{/* 
         {currentTaskType?.includes("VOICEOVER") && !isBulkTaskDownload && (
           <>
             <DialogContentText id="select-speaker-info" sx={{ mt: 2 }}>
@@ -196,7 +196,7 @@ const ExportDialog = ({
               </FormControl>
             </DialogActions>
           </>
-        )}
+        )} */}
 
         <DialogActions>
           <Button

diff --git a/src/common/TimeBoxes.jsx b/src/common/TimeBoxes.jsx
@@ -2,15 +2,15 @@ import React, { memo } from "react";
 import { ProjectStyle } from "styles";
 import { TextField } from "@mui/material";
 
-const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly }) => {
+const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly, player }) => {
   const classes = ProjectStyle();
 
   return (
     <div style={{display: "flex", margin:"0"}}>
       <TextField
         variant="standard"
         onChange={(event) =>
-          handleTimeChange(event.target.value, index, type, "hours")
+          handleTimeChange(event.target.value, index, type, "hours", player)
         }
         value={time.split(":")[0]}
         onFocus={(event) => event.target.select()}
@@ -36,7 +36,7 @@ const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly }) => {
         onFocus={(event) => event.target.select()}
         InputProps={{ inputProps: { min: 0, max: 100 }, readOnly:readOnly }}
         onChange={(event) =>
-          handleTimeChange(event.target.value, index, type, "minutes")
+          handleTimeChange(event.target.value, index, type, "minutes", player)
         }
       />
 
@@ -55,7 +55,7 @@ const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly }) => {
         InputProps={{ inputProps: { min: 0, max: 100 }, readOnly:readOnly }}
         className={classes.timeInputBox}
         onChange={(event) =>
-          handleTimeChange(event.target.value, index, type, "seconds")
+          handleTimeChange(event.target.value, index, type, "seconds", player)
         }
         // style={{
 
@@ -78,7 +78,7 @@ const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly }) => {
         InputProps={{ inputProps: { min: 0, max: 999 }, readOnly:readOnly }}
         className={classes.timeInputBox}
         onChange={(event) =>
-          handleTimeChange(event.target.value, index, type, "miliseconds")
+          handleTimeChange(event.target.value, index, type, "miliseconds", player)
         }
       />
     </div>