Author: kitone
Date: Fri Apr 17 15:41:56 2015
New Revision: 909
URL: http://svn.gna.org/viewcvs/subtitleeditor?rev=909&view=rev
Log:
Add the ability to use option #time.
Modified:
trunk/ChangeLog
trunk/plugins/actions/externalvideoplayer/dialog-external-video-player-preferences.ui
trunk/plugins/actions/externalvideoplayer/externalvideoplayer.cc
Modified: trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/ChangeLog?rev=909&r1=908&r2=909&view=diff
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Fri Apr 17 15:41:56 2015
@@ -1,3 +1,9 @@
+2015-04-17 kitone <[email protected]>
+
+ *
plugins/actions/externalvideoplayer/dialog-external-video-player-preferences.ui:
+ * plugins/actions/externalvideoplayer/externalvideoplayer.cc:
+ Add the ability to use option #time.
+
2015-04-17 kitone <[email protected]>
*
plugins/actions/externalvideoplayer/dialog-external-video-player-preferences.ui:
Modified:
trunk/plugins/actions/externalvideoplayer/dialog-external-video-player-preferences.ui
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/externalvideoplayer/dialog-external-video-player-preferences.ui?rev=909&r1=908&r2=909&view=diff
==============================================================================
---
trunk/plugins/actions/externalvideoplayer/dialog-external-video-player-preferences.ui
(original)
+++
trunk/plugins/actions/externalvideoplayer/dialog-external-video-player-preferences.ui
Fri Apr 17 15:41:56 2015
@@ -251,6 +251,36 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="label15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"><span
size="small"><b>#time</b></span></property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><span
size="small">the time to the current selected line (format
hh:mm:ss:ms)</span></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<placeholder/>
</child>
<child>
Modified: trunk/plugins/actions/externalvideoplayer/externalvideoplayer.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/externalvideoplayer/externalvideoplayer.cc?rev=909&r1=908&r2=909&view=diff
==============================================================================
--- trunk/plugins/actions/externalvideoplayer/externalvideoplayer.cc
(original)
+++ trunk/plugins/actions/externalvideoplayer/externalvideoplayer.cc Fri Apr
17 15:41:56 2015
@@ -201,13 +201,16 @@
save_to_temporary_file(doc, get_tmp_file_as_uri() );
// create the command
+ SubtitleTime time = get_start_position(doc);
+
Glib::ustring command = get_command();
utility::replace(command, "#video_file",
Glib::filename_from_uri(m_movie_uri));
utility::replace(command, "#video_uri", m_movie_uri);
utility::replace(command, "#subtitle_file", get_tmp_file());
utility::replace(command,
"#subtitle_uri",get_tmp_file_as_uri());
- utility::replace(command, "#seconds",
to_string(get_start_position(doc)));
+ utility::replace(command, "#seconds",
convert_to_second_string(time));
+ utility::replace(command, "#time",
convert_to_time_string(time));
std::cout << "COMMAND: " << command << std::endl;
@@ -283,20 +286,34 @@
/*
*/
- long get_start_position(Document *document)
+ SubtitleTime get_start_position(Document *document)
{
std::vector<Subtitle> selection =
document->subtitles().get_selection();
if(selection.empty())
- return 0;
+ return SubtitleTime(0);
Subtitle sub = selection[0];
SubtitleTime time = sub.get_start() - get_prefered_offset();
-
+ if(time.totalmsecs < 0)
+ return SubtitleTime(0);
+ return time;
+ }
+
+ /*
+ */
+ Glib::ustring convert_to_time_string(const SubtitleTime &time)
+ {
+ return time.str();
+ }
+
+ /*
+ */
+ Glib::ustring convert_to_second_string(const SubtitleTime &time)
+ {
long p = time.hours()*3600 + time.minutes()*60 + time.seconds();
-
- return (p < 0) ? 0 : p;
+ return to_string(p);
}
/*
_______________________________________________
Subtitleeditor-commits mailing list
[email protected]
https://mail.gna.org/listinfo/subtitleeditor-commits
