libunity

Merge lp:~stolowski/libunity/video-props-in-extras into lp:libunity

  1. video-props-in-extras
  2. Merge into trunk
Proposed by Paweł Stołowski
Status: Superseded
Proposed branch: lp:~stolowski/libunity/video-props-in-extras
Merge into: lp:libunity
Diff against target: 97 lines (+19/-16)
4 files modified
Makefile.decl (+2/-14)
configure.ac (+2/-2)
debian/libunity9.symbols (+4/-0)
extras/unity-extra-preview-player-client.vala (+11/-0)
To merge this branch: bzr merge lp:~stolowski/libunity/video-props-in-extras
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Unity Team Pending
Review via email: mp+135841@code.launchpad.net

Commit message

Added method to obtain video file properties via dbus call to preview player in extras.

Description of the change

Added method to obtain video file properties via dbus call to preview player in extras. This is needed for new video lens rewritten in vala.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:195
http://s-jenkins:8080/job/libunity-ci/2/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/libunity-ci/./distribution=quantal,flavor=amd64,label=pbuilder/2/console
    FAILURE: http://s-jenkins:8080/job/libunity-ci/./distribution=quantal,flavor=i386,label=pbuilder/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/2//rebuild/?

review: Needs Fixing (continuous-integration)
lp:~stolowski/libunity/video-props-in-extras updated
196. By Paweł Stołowski

Updated symbols.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:196
http://s-jenkins:8080/job/libunity-ci/3/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/libunity-ci/./distribution=quantal,flavor=amd64,label=pbuilder/3/console
    FAILURE: http://s-jenkins:8080/job/libunity-ci/./distribution=quantal,flavor=i386,label=pbuilder/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/3//rebuild/?

review: Needs Fixing (continuous-integration)
lp:~stolowski/libunity/video-props-in-extras updated
197. By Paweł Stołowski

Use xvfb-run to launch headless tests via Xvfb.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:197
http://s-jenkins:8080/job/libunity-ci/4/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/libunity-ci/./distribution=quantal,flavor=amd64,label=pbuilder/4/console
    SUCCESS: http://s-jenkins:8080/job/libunity-ci/./distribution=quantal,flavor=i386,label=pbuilder/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/4//rebuild/?

review: Approve (continuous-integration)
lp:~stolowski/libunity/video-props-in-extras updated
198. By Paweł Stołowski

Fixed symbols to use '0replaceme'.

199. By Paweł Stołowski

Fixed test-headless rule - don't use dbus-launch (not needed), don't create useless log file.

200. By Paweł Stołowski

Merged trunk.

201. By Paweł Stołowski

Implemented tests for preview player interface from unity extras.
TODO: 'progress' signal test (fails due to weird compilation issue, commented out for now).

202. By Paweł Stołowski

Enabled test for progress signal; compile test of 'extras' in a separate binary to avoid compilation issues when both unity-extras and unity-internal are enabled.

203. By Paweł Stołowski

Some cleanups.

204. By Paweł Stołowski

Declare async methods in the test, to match real signatures for PlayerService.

205. By Paweł Stołowski

Generate unity-extras-internal{.vapi, .h}.

206. By Paweł Stołowski

Use Extras.PreviewPlayerService interface definition in the test.

207. By Paweł Stołowski

Made test_loop a global variable, not a membler of service mock.

208. By Paweł Stołowski

Create service mock instance in each test.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.decl'
2--- Makefile.decl 2012-10-26 14:42:43 +0000
3+++ Makefile.decl 2012-11-23 13:43:21 +0000
4@@ -71,25 +71,13 @@
5 if ENABLE_HEADLESS_TESTS
6 check-local: test-headless
7
8-DISPLAY = :27
9 LOG_PATH = headless-logs
10 test-headless:
11 set -e; \
12- export DISPLAY=$(DISPLAY); \
13 rm -rf $(LOG_PATH); \
14 mkdir $(LOG_PATH); \
15- $(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
16- sleep 1; \
17- \
18- $(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
19- source $(LOG_PATH)/sessionbus.sh; \
20- sleep 1; \
21- \
22- make test-nonrecursive; \
23- sleep 1; \
24- \
25- kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
26- pkill Xvfb;
27+ $(XVFB) dbus-launch make test-nonrecursive 2>&1 | tee $(LOG_PATH)/XVfb.log; \
28+ sleep 1;
29 else
30 check-local: test-nonrecursive
31 endif
32
33=== modified file 'configure.ac'
34--- configure.ac 2012-11-05 21:09:31 +0000
35+++ configure.ac 2012-11-23 13:43:21 +0000
36@@ -1,5 +1,5 @@
37 # When releasing also remember to update the soname as instructed below
38-AC_INIT(libunity, 6.90.0)
39+AC_INIT(libunity, 6.90.1)
40
41 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
42 AM_CONFIG_HEADER(config.h)
43@@ -174,7 +174,7 @@
44 AM_CONDITIONAL([ENABLE_HEADLESS_TESTS],[test "x$enable_headless_tests" != "xno"])
45
46 if test "x$enable_headless_tests" = "xyes"; then
47- AC_PATH_PROG([XVFB],[Xvfb])
48+ AC_PATH_PROG([XVFB],[xvfb-run])
49 AC_PATH_PROG([DBUS_LAUNCH],[dbus-launch])
50 fi
51
52
53=== modified file 'debian/libunity9.symbols'
54--- debian/libunity9.symbols 2012-11-05 21:09:31 +0000
55+++ debian/libunity9.symbols 2012-11-23 13:43:21 +0000
56@@ -38,8 +38,12 @@
57 unity_extras_preview_player_service_resume_finish@Base 6.10.0-0ubuntu2
58 unity_extras_preview_player_service_stop@Base 6.10.0-0ubuntu2
59 unity_extras_preview_player_service_stop_finish@Base 6.10.0-0ubuntu2
60+ unity_extras_preview_player_service_video_properties@Base 6.11.0
61+ unity_extras_preview_player_service_video_properties_finish@Base 6.11.0
62 unity_extras_preview_player_stop@Base 6.10.0-0ubuntu2
63 unity_extras_preview_player_stop_finish@Base 6.10.0-0ubuntu2
64+ unity_extras_preview_player_video_properties@Base 6.11.0
65+ unity_extras_preview_player_video_properties_finish@Base 6.11.0
66 unity_extras_show_in_folder@Base 6.10.0-0ubuntu2
67 unity_extras_show_in_folder_finish@Base 6.10.0-0ubuntu2
68 libunity.so.9 libunity9 #MINVER#
69
70=== modified file 'extras/unity-extra-preview-player-client.vala'
71--- extras/unity-extra-preview-player-client.vala 2012-10-16 15:33:50 +0000
72+++ extras/unity-extra-preview-player-client.vala 2012-11-23 13:43:21 +0000
73@@ -33,6 +33,7 @@
74 public abstract async void resume () throws Error;
75 public abstract async void stop () throws Error;
76 public abstract async void close () throws Error;
77+ public abstract async HashTable<string, Variant> video_properties (string uri) throws Error;
78 }
79
80 /**
81@@ -105,6 +106,16 @@
82 yield _preview_player_service.close ();
83 }
84
85+ public async HashTable<string, Variant> video_properties (string uri) throws Error
86+ {
87+ if (_preview_player_service == null)
88+ {
89+ yield connect_to ();
90+ }
91+ var props = yield _preview_player_service.video_properties (uri);
92+ return props;
93+ }
94+
95 internal void on_progress_signal (string uri, uint32 state, double progress_value)
96 {
97 progress(uri, (Unity.MusicPreview.TrackState)state, progress_value);

Subscribers

People subscribed via source and target branches